From 5fa7768bfb4b6d464c6a812822b0665f52e7bea4 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Tue, 31 Jan 2017 19:31:55 +0200 Subject: wic: code cleanup Fixed indentation, unused imports, trailing lines etc. [YOCTO #10619] Signed-off-by: Ed Bartosh --- scripts/lib/wic/utils/misc.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'scripts/lib/wic/utils/misc.py') 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=""): """ -- cgit v1.2.3