diff options
| author | Luis Lozano <llozano@chromium.org> | 2015-12-10 10:47:01 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2015-12-15 01:21:49 +0000 |
| commit | 036c9233742004aa773a374df381b1cf137484f5 (patch) | |
| tree | b1566971ae12ed6ec13f086dd450eca741604f26 /tc_enter_chroot.py | |
| parent | e627fd61c2edba668eb2af8221892286b13f05a3 (diff) | |
| download | toolchain-utils-036c9233742004aa773a374df381b1cf137484f5.tar.gz | |
crosperf: RunCommand should return one type of object.
Cleaned up the interfaces for the RunCommand routines.
These were returning different types (int or tuple) depending on
the value of the return_ouput parameter.
Returning different unrelated types from a routine is bad practice.
Linter complains about this with several warnings like this:
"Attempting to unpack a non-sequence defined at line XY of
utils.command_executer"
BUG=chromium:566256
TEST=ran crosperf with a example experiment file
Ran run_tests.
Change-Id: Ibb83ab9322c87558077fc4937ef5c0686bbe5417
Reviewed-on: https://chrome-internal-review.googlesource.com/241459
Commit-Ready: Luis Lozano <llozano@chromium.org>
Tested-by: Luis Lozano <llozano@chromium.org>
Reviewed-by: Han Shen <shenhan@google.com>
Diffstat (limited to 'tc_enter_chroot.py')
| -rwxr-xr-x | tc_enter_chroot.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tc_enter_chroot.py b/tc_enter_chroot.py index 85b8a509..c68c48a2 100755 --- a/tc_enter_chroot.py +++ b/tc_enter_chroot.py @@ -48,7 +48,7 @@ class MountPoint: ce = command_executer.GetCommandExecuter() mount_signature = "%s on %s" % (self.external_dir, self.mount_dir) command = "mount" - retval, out, err = ce.RunCommand(command, return_output=True) + retval, out, err = ce.RunCommandWOutput(command) if mount_signature not in out: retval = self.CreateAndOwnDir(self.mount_dir) logger.GetLogger().LogFatalIf(retval, "Cannot create mount_dir!") @@ -239,12 +239,13 @@ def Main(argv, return_output=False): command += " sudo ./" + command_file else: command += " ./" + command_file - retval = command_executer.GetCommandExecuter().RunCommand(command, return_output) + retval = command_executer.GetCommandExecuter().RunCommandGeneric( + command, return_output) return retval else: os.chdir("%s/src/scripts" % chromeos_root) ce = command_executer.GetCommandExecuter() - [ret, out, err] = ce.RunCommand("which cros_sdk", return_output=True) + _, out, _ = ce.RunCommandWOutput("which cros_sdk") cros_sdk_binary = out.split()[0] return os.execv(cros_sdk_binary, ["", "--enter"]) |