commit 557e68830e8755dd84a0ec602adfbe240a37908b
author Aviv Keshet <akeshet@chromium.org> Thu Apr 25 13:26:09 2013 -0700
committer ChromeBot <chrome-bot@google.com> Tue Apr 30 13:46:13 2013 -0700
tree 23024fe7ed5792db3756f00e3f7763574c977e77
parent 68e7cbf4af85a925c3a1ed0803008fc9e236454a

Fix misc style issues in autotest_quickmerge

This CL addresses some comments to previous CLs on this file.

BUG=None
TEST=None

Change-Id: I946804104798f8d16857bf6b379ccf9b343ec348
Reviewed-on: https://gerrit.chromium.org/gerrit/49553
Tested-by: Aviv Keshet <akeshet@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Aviv Keshet <akeshet@chromium.org>

scripts/autotest_quickmerge.py

diff --git a/scripts/autotest_quickmerge.py b/scripts/autotest_quickmerge.py
index cff38a8..f8e970f 100644
--- a/scripts/autotest_quickmerge.py
+++ b/scripts/autotest_quickmerge.py
@@ -11,7 +11,6 @@
 """
 
 import argparse
-import errno
 import logging
 import os
 import re
@@ -22,6 +21,7 @@
 from chromite.buildbot import portage_utilities
 from chromite.lib import cros_build_lib
 from chromite.lib import git
+from chromite.lib import osutils
 
 
 if cros_build_lib.IsInsideChroot():
@@ -169,7 +169,7 @@
     downgrade_to_version: String version to downgrade to. Default: '0'
 
   Returns:
-    Returns the return value of the `mv` command used to perform operation.
+    True on success. False on failure (nonzero return code from `mv` command).
   """
   package, _ = GetPackageAPI(portage_root, package_cp)
 
@@ -177,9 +177,10 @@
   destination_path = os.path.join(
       package.dbroot, package_cp + '-' + downgrade_to_version)
   if os.path.abspath(source_directory) == os.path.abspath(destination_path):
-    return 0
+    return True
   command = ['mv', source_directory, destination_path]
-  return cros_build_lib.SudoRunCommand(command).returncode
+  code = cros_build_lib.SudoRunCommand(command, error_code_ok=True).returncode
+  return code == 0
 
 
 def UpdatePackageContents(change_report, package_cp, portage_root=None):
@@ -224,13 +225,8 @@
     package_filename = 'test-' + package + '.tar.bz2'
     package_file_fullpath = os.path.join(autotest_sysroot, 'packages',
                                          package_filename)
-    try:
-      os.remove(package_file_fullpath)
+    if osutils.SafeUnlink(package_file_fullpath):
       logging.info('Removed stale %s', package_file_fullpath)
-    except OSError as err:
-      # Suppress no-such-file exceptions. Raise all others.
-      if err.errno != errno.ENOENT:
-        raise
 
 
 def RsyncQuickmerge(source_path, sysroot_autotest_path,
@@ -247,6 +243,9 @@
     pretend:   True to use the '-n' option to rsync, to perform dry run.
     overwrite: True to omit '-u' option, overwrite all files in sysroot,
                not just older files.
+
+  Returns:
+    The cros_build_lib.CommandResult object resulting from the rsync command.
   """
   command = ['rsync', '-a']
 
@@ -337,7 +336,7 @@
     UpdatePackageContents(change_report, AUTOTEST_TESTS_EBUILD,
                           sysroot_path)
     for ebuild in DOWNGRADE_EBUILDS:
-      if DowngradePackageVersion(sysroot_path, ebuild) != 0:
+      if not DowngradePackageVersion(sysroot_path, ebuild):
         logging.warning('Unable to downgrade package %s version number.',
                         ebuild)
     stale_packages = GetStalePackageNames(