diff options
Diffstat (limited to 'scripts/lib/wic/utils/misc.py')
-rw-r--r-- | scripts/lib/wic/utils/misc.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/scripts/lib/wic/utils/misc.py b/scripts/lib/wic/utils/misc.py index 6781d8381a..edb9c5b484 100644 --- a/scripts/lib/wic/utils/misc.py +++ b/scripts/lib/wic/utils/misc.py | |||
@@ -77,18 +77,15 @@ def _exec_cmd(cmd_and_args, as_shell=False, catch=3): | |||
77 | msger.debug("_exec_cmd: output for %s (rc = %d): %s" % \ | 77 | msger.debug("_exec_cmd: output for %s (rc = %d): %s" % \ |
78 | (cmd_and_args, ret, out)) | 78 | (cmd_and_args, ret, out)) |
79 | 79 | ||
80 | return (ret, out) | 80 | return ret, out |
81 | 81 | ||
82 | 82 | ||
83 | def exec_cmd(cmd_and_args, as_shell=False, catch=3): | 83 | def exec_cmd(cmd_and_args, as_shell=False, catch=3): |
84 | """ | 84 | """ |
85 | Execute command, catching stderr, stdout | 85 | Execute command, return output |
86 | |||
87 | Exits if rc non-zero | ||
88 | """ | 86 | """ |
89 | ret, out = _exec_cmd(cmd_and_args, as_shell, catch) | 87 | return _exec_cmd(cmd_and_args, as_shell, catch)[1] |
90 | 88 | ||
91 | return out | ||
92 | 89 | ||
93 | def exec_native_cmd(cmd_and_args, native_sysroot, catch=3, pseudo=""): | 90 | def exec_native_cmd(cmd_and_args, native_sysroot, catch=3, pseudo=""): |
94 | """ | 91 | """ |