flash/deploy: Do not overwrite brick argument.
This prohibits using the brick name later. And it's generally bad
practice to reassign a variable with a different value type.
BUG=None
TEST=Unit tests (checked again, it works).
Change-Id: Ice268470abe6ffc5020af568097f466eeffa6822
Reviewed-on: https://chromium-review.googlesource.com/268519
Reviewed-by: David Pursell <dpursell@chromium.org>
Reviewed-by: Bertrand Simonnet <bsimonnet@chromium.org>
Commit-Queue: Gilad Arnold <garnold@chromium.org>
Tested-by: Gilad Arnold <garnold@chromium.org>
diff --git a/cli/deploy.py b/cli/deploy.py
index 66e7a4a..083737b 100644
--- a/cli/deploy.py
+++ b/cli/deploy.py
@@ -844,17 +844,17 @@
(device.sdk_version or 'unknown', sdk_version))
-def Deploy(device, packages, board=None, brick=None, emerge=True, update=False,
- deep=False, deep_rev=False, clean_binpkg=True, root='/', strip=True,
- emerge_args=None, ssh_private_key=None, ping=True, force=False,
- dry_run=False):
+def Deploy(device, packages, board=None, brick_name=None, emerge=True,
+ update=False, deep=False, deep_rev=False, clean_binpkg=True,
+ root='/', strip=True, emerge_args=None, ssh_private_key=None,
+ ping=True, force=False, dry_run=False):
"""Deploys packages to a device.
Args:
device: commandline.Device object; None to use the default device.
packages: List of packages (strings) to deploy to device.
board: Board to use; None to automatically detect.
- brick: Brick locator to use. Overrides |board| if not None.
+ brick_name: Brick locator to use. Overrides |board| if not None.
emerge: True to emerge package, False to unmerge.
update: Check installed version on device.
deep: Install dependencies also. Implies |update|.
@@ -880,7 +880,7 @@
if update and not emerge:
raise ValueError('Cannot update and unmerge.')
- brick = brick_lib.Brick(brick) if brick else None
+ brick = brick_lib.Brick(brick_name) if brick_name else None
if brick:
board = brick.FriendlyName()