diff options
| author |   Ed Bartosh <ed.bartosh@linux.intel.com> | 2015-08-18 18:41:33 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-30 12:34:28 +0100 |
| commit | 3b400a06d755e3d437967f60842b1d9bd94f0814 (patch) | |
| tree | 7b2cc95b1ee4f0985beeec9cd8f235d3a64816f9 /scripts | |
| parent | 58d9f06b2d467dcff781fecf4cbf03b0b7e25432 (diff) | |
| download | openembedded-core-contrib-3b400a06d755e3d437967f60842b1d9bd94f0814.tar.gz | |
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 <ed.bartosh@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/wic/utils/oe/misc.py | 12 |
1 files 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: |