commit af019fb3e032efdd8b7aae99577634287b59add5
author Brian Harring <ferringb@chromium.org> Thu May 10 15:06:13 2012 -0700
committer Gerrit <chrome-bot@google.com> Fri May 11 23:25:32 2012 -0700
tree f50731a90a2b342aea619738434601588a2241c5
parent 1dc9613b6d3c9c7e13149817ed9c343fdf6c5530

Add a osutils module for simple file/os manipulation ops.

Basically removes some boilerplate, while making a few trickier
things (atomic file updates for example) accessible via a clean
api.

BUG=None
TEST=run_tests
TEST=cbuildbot x86-generic-paladin --remote
TEST=cbuildbot x86-generic-paladin --buildbot <usual>

Change-Id: I22cd73ffc4480974dbd0a2e154c7a364405e2b8e
Reviewed-on: https://gerrit.chromium.org/gerrit/22415
Commit-Ready: Brian Harring <ferringb@chromium.org>
Reviewed-by: Brian Harring <ferringb@chromium.org>
Tested-by: Brian Harring <ferringb@chromium.org>

scripts/cros_setup_toolchains.py

diff --git a/scripts/cros_setup_toolchains.py b/scripts/cros_setup_toolchains.py
index 83f3e3e..cec5b7b 100644
--- a/scripts/cros_setup_toolchains.py
+++ b/scripts/cros_setup_toolchains.py
@@ -14,6 +14,7 @@
 
 from chromite.buildbot import constants
 from chromite.lib import cros_build_lib
+from chromite.lib import osutils
 
 # Some sanity checks first.
 if not cros_build_lib.IsInsideChroot():
@@ -180,11 +181,9 @@
   for overlay in overlays:
     config = os.path.join(overlay, 'toolchain.conf')
     if os.path.exists(config):
-      with open(config) as config_file:
-        lines = config_file.read().splitlines()
-        for line in lines:
-          line = line.split('#', 1)[0]
-          targets.update(line.split())
+      for line in osutils.ReadFile(config).splitlines():
+        line = line.split('#', 1)[0]
+        targets.update(line.split())
 
   # Remove the host target as that is not a cross-target. Replace with 'host'.
   targets.discard(GetHostTuple())
@@ -327,11 +326,7 @@
     target - the target for which to remove the file
   """
   maskfile = os.path.join('/etc/portage/package.mask', 'cross-' + target)
-  try:
-    os.unlink(maskfile)
-  except EnvironmentError as e:
-    if e.errno != errno.ENOENT:
-      raise
+  osutils.SafeUnlink(maskfile)
 
 
 def CreatePackageMask(target, masks):
@@ -344,7 +339,7 @@
   """
   maskfile = os.path.join('/etc/portage/package.mask', 'cross-' + target)
   assert not os.path.exists(maskfile)
-  cros_build_lib.SafeMakedirs(os.path.dirname(maskfile))
+  osutils.SafeMakedirs(os.path.dirname(maskfile))
 
   with open(maskfile, 'w') as f:
     for pkg, m in masks.items():
@@ -363,12 +358,9 @@
     target - target for which to recreate package.keywords
   """
   maskfile = os.path.join('/etc/portage/package.keywords', 'cross-' + target)
-  try:
-    os.unlink(maskfile)
-  except EnvironmentError as e:
-    if e.errno != errno.ENOENT:
-      raise
-  cros_build_lib.SafeMakedirs(os.path.dirname(maskfile))
+  osutils.SafeUnlink(maskfile)
+
+  osutils.SafeMakedirs(os.path.dirname(maskfile))
 
   keyword = GetPortageKeyword(target)