commit 655e67dfa76010b7bad6c63d12aa604d51efb963
author Gilad Arnold <garnold@chromium.org> Wed Apr 29 11:14:18 2015 -0700
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Fri May 01 03:43:58 2015 +0000
tree cd28589963332b3b5b0a6815af42775230c8319c
parent 23bfb22e46386e6b3b89cad3c6ee97c84800f5b1

deploy: Do not overwrite device argument.

This prohibits using the device specification later. And it's generally
bad practice to reassign a variable with a different value type.

BUG=None
TEST=Unit tests.

Change-Id: I611b7006d82285363a916169b440c545e17335b6
Reviewed-on: https://chromium-review.googlesource.com/268530
Reviewed-by: Bertrand Simonnet <bsimonnet@chromium.org>
Tested-by: Gilad Arnold <garnold@chromium.org>
Commit-Queue: Gilad Arnold <garnold@chromium.org>

cli/deploy.py

diff --git a/cli/deploy.py b/cli/deploy.py
index 083737b..f67a510 100644
--- a/cli/deploy.py
+++ b/cli/deploy.py
@@ -891,24 +891,24 @@
 
   with remote_access.ChromiumOSDeviceHandler(
       hostname, port=port, username=username, private_key=ssh_private_key,
-      base_dir=_DEVICE_BASE_DIR, ping=ping) as device:
+      base_dir=_DEVICE_BASE_DIR, ping=ping) as device_handler:
     try:
-      board = cros_build_lib.GetBoard(device_board=device.board,
+      board = cros_build_lib.GetBoard(device_board=device_handler.board,
                                       override_board=board)
       logging.info('Board is %s', board)
 
       if not force:
         # If a brick is specified, it must be compatible with the device.
         if brick:
-          if not brick.Inherits(device.board):
+          if not brick.Inherits(device_handler.board):
             raise DeployError('Device (%s) is incompatible with brick' %
-                              device.board)
-        elif board != device.board:
+                              device_handler.board)
+        elif board != device_handler.board:
           raise DeployError('Device (%s) is incompatible with board' %
-                            device.board)
+                            device_handler.board)
 
         # Check that the target is compatible with the SDK (if any).
-        _CheckDeviceVersion(device)
+        _CheckDeviceVersion(device_handler)
 
       sysroot = cros_build_lib.GetSysroot(board=board)
 
@@ -921,15 +921,15 @@
         logging.info('Cleaning outdated binary packages for %s', board)
         portage_util.CleanOutdatedBinaryPackages(board)
 
-      if not device.IsPathWritable(root):
+      if not device_handler.IsPathWritable(root):
         # Only remounts rootfs if the given root is not writable.
-        if not device.MountRootfsReadWrite():
+        if not device_handler.MountRootfsReadWrite():
           raise DeployError('Cannot remount rootfs as read-write. Exiting.')
 
       # Obtain list of packages to upgrade/remove.
       pkg_scanner = _InstallPackageScanner(sysroot)
-      pkgs, listed, num_updates = pkg_scanner.Run(device, root, packages,
-                                                  update, deep, deep_rev)
+      pkgs, listed, num_updates = pkg_scanner.Run(
+          device_handler, root, packages, update, deep, deep_rev)
       if emerge:
         action_str = 'emerge'
       else:
@@ -949,16 +949,16 @@
 
       for pkg in pkgs:
         if emerge:
-          _Emerge(device, pkg, strip, board, sysroot, root,
+          _Emerge(device_handler, pkg, strip, board, sysroot, root,
                   extra_args=emerge_args)
         else:
-          _Unmerge(device, pkg, root)
+          _Unmerge(device_handler, pkg, root)
 
       logging.warning('Please restart any updated services on the device, '
                       'or just reboot it.')
     except Exception:
-      if device.lsb_release:
-        lsb_entries = sorted(device.lsb_release.items())
+      if device_handler.lsb_release:
+        lsb_entries = sorted(device_handler.lsb_release.items())
         logging.info('Following are the LSB version details of the device:\n%s',
                      '\n'.join('%s=%s' % (k, v) for k, v in lsb_entries))
       raise