cros_build_lib.run: clean up error_code_ok->check migration
BUG=chromium:1006587
TEST=`./run_tests` passes
Change-Id: Ie416c5f7b16314a34a3a53f503469b3cc93fb9e2
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1965957
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Chris McDonald <cjmcdonald@chromium.org>
diff --git a/cli/deploy.py b/cli/deploy.py
index 97306b2..900b6f7 100644
--- a/cli/deploy.py
+++ b/cli/deploy.py
@@ -911,7 +911,7 @@
cmd = ['qmerge', '--yes']
# Check if qmerge is available on the device. If not, use emerge.
if device.RunCommand(
- ['qmerge', '--version'], error_code_ok=True).returncode != 0:
+ ['qmerge', '--version'], check=False).returncode != 0:
cmd = ['emerge']
cmd.extend(['--unmerge', pkg, '--root=%s' % root])
@@ -1025,7 +1025,7 @@
# On DUT, |pkg_path| is the directory which contains environment file.
environment_path = os.path.join(pkg_path, _ENVIRONMENT_FILENAME)
result = device.RunCommand(['test', '-f', environment_path],
- error_code_ok=True)
+ check=False)
if result.returncode == 1:
# The package is not installed on DUT yet. Skip extracting info.
return None, None