From 3b400a06d755e3d437967f60842b1d9bd94f0814 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Tue, 18 Aug 2015 18:41:33 +0300 Subject: wic: remove undescore from function name Renamed __exec_cmd -> _exec_cmd as double underscores cause strange behaviour when function is called in class method. Python complains that __exec_cmd method(!!!) of the same class doesn't exist. Signed-off-by: Ed Bartosh Signed-off-by: Ross Burton --- scripts/lib/wic/utils/oe/misc.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/lib/wic/utils/oe/misc.py b/scripts/lib/wic/utils/oe/misc.py index d399f2a480..9c8f52dd0d 100644 --- a/scripts/lib/wic/utils/oe/misc.py +++ b/scripts/lib/wic/utils/oe/misc.py @@ -46,13 +46,13 @@ NATIVE_RECIPES = {"mcopy": "mtools", "syslinux": "syslinux" } -def __exec_cmd(cmd_and_args, as_shell=False, catch=3): +def _exec_cmd(cmd_and_args, as_shell=False, catch=3): """ Execute command, catching stderr, stdout Need to execute as_shell if the command uses wildcards """ - msger.debug("__exec_cmd: %s" % cmd_and_args) + msger.debug("_exec_cmd: %s" % cmd_and_args) args = cmd_and_args.split() msger.debug(args) @@ -61,7 +61,7 @@ def __exec_cmd(cmd_and_args, as_shell=False, catch=3): else: ret, out = runner.runtool(args, catch) out = out.strip() - msger.debug("__exec_cmd: output for %s (rc = %d): %s" % \ + msger.debug("_exec_cmd: output for %s (rc = %d): %s" % \ (cmd_and_args, ret, out)) return (ret, out) @@ -73,7 +73,7 @@ def exec_cmd(cmd_and_args, as_shell=False, catch=3): Exits if rc non-zero """ - ret, out = __exec_cmd(cmd_and_args, as_shell, catch) + ret, out = _exec_cmd(cmd_and_args, as_shell, catch) if ret != 0: msger.error("exec_cmd: %s returned '%s' instead of 0" % \ @@ -99,7 +99,7 @@ def exec_native_cmd(cmd_and_args, native_sysroot, catch=3): args = cmd_and_args.split() msger.debug(args) - ret, out = __exec_cmd(native_cmd_and_args, True, catch) + ret, out = _exec_cmd(native_cmd_and_args, True, catch) if ret == 127: # shell command-not-found prog = args[0] @@ -139,7 +139,7 @@ def get_bitbake_var(var, image=None): log_level = msger.get_loglevel() msger.set_loglevel('normal') - ret, lines = __exec_cmd(cmd) + ret, lines = _exec_cmd(cmd) msger.set_loglevel(log_level) if ret: -- cgit 1.2.3-korg