aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/lib/wic/utils/misc.py
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-01-31 19:31:55 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-02 17:37:36 +0000
commit5fa7768bfb4b6d464c6a812822b0665f52e7bea4 (patch)
tree3b8e004abd3a91f458856e0385d8379e8b129a48 /scripts/lib/wic/utils/misc.py
parent835f7a5c4c51f3d0d31d0193258b50596ceacb5a (diff)
downloadopenembedded-core-contrib-5fa7768bfb4b6d464c6a812822b0665f52e7bea4.tar.gz
wic: code cleanup
Fixed indentation, unused imports, trailing lines etc. [YOCTO #10619] Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Diffstat (limited to 'scripts/lib/wic/utils/misc.py')
-rw-r--r--scripts/lib/wic/utils/misc.py9
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):
msger.debug("_exec_cmd: output for %s (rc = %d): %s" % \
(cmd_and_args, ret, out))
- return (ret, out)
+ return ret, out
def exec_cmd(cmd_and_args, as_shell=False, catch=3):
"""
- Execute command, catching stderr, stdout
-
- Exits if rc non-zero
+ Execute command, return output
"""
- ret, out = _exec_cmd(cmd_and_args, as_shell, catch)
+ return _exec_cmd(cmd_and_args, as_shell, catch)[1]
- return out
def exec_native_cmd(cmd_and_args, native_sysroot, catch=3, pseudo=""):
"""