commit 964ed7ec01bbe8e9a9d827ceffb78d1fc90ef08c
author Jae Hoon Kim <kimjae@chromium.org> Fri May 15 13:59:23 2020 -0700
committer Commit Bot <commit-bot@chromium.org> Mon May 18 20:03:46 2020 +0000
tree b8ec3708f96e60ec1b6a49bf5f40d60242f239d6
parent 7662853d1d35c7c4700cef0ebaf3189dea06a1ff

cros_deploy: dlcservice_util takes single id

--dlc_ids is deprecated for --id

BUG=chromium:1078556
TEST=./run_pytest

Cq-Depend: chromium:2204667, chromium:2204668
Change-Id: Ie1a16b30d119ad50eb3d6a2a9ff92d681312f5a8
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2204579
Tested-by: Jae Hoon Kim <kimjae@chromium.org>
Reviewed-by: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Jae Hoon Kim <kimjae@chromium.org>
Auto-Submit: Jae Hoon Kim <kimjae@chromium.org>

cli/deploy.py

diff --git a/cli/deploy.py b/cli/deploy.py
index 7ef0ac0..c5fce63 100644
--- a/cli/deploy.py
+++ b/cli/deploy.py
@@ -997,7 +997,7 @@
     dlc_id = pkg_attrs[_DLC_ID]
     logging.notice('Uninstalling DLC image for %s', dlc_id)
 
-    device.run(['dlcservice_util', '--uninstall', '--dlc_ids=%s' % dlc_id])
+    device.run(['dlcservice_util', '--uninstall', '--id=%s' % dlc_id])
     return True
   else:
     logging.debug('DLC_ID not found in package')
@@ -1011,7 +1011,7 @@
 
   logging.debug('Uninstall DLC %s if it is installed.', dlc_id)
   try:
-    device.run(['dlcservice_util', '--uninstall', '--dlc_ids=%s' % dlc_id])
+    device.run(['dlcservice_util', '--uninstall', '--id=%s' % dlc_id])
   except cros_build_lib.RunCommandError as e:
     logging.info('Failed to uninstall DLC:%s. Continue anyway.',
                  e.result.error)