diff options
| author | Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com> | 2017-06-28 09:59:18 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-21 12:36:36 +0100 |
| commit | 21f04b61973dd9029f0e6bff5445e31cd762bf32 (patch) | |
| tree | 0db6c84be0fc4e941cf2c0d94a3dbeb44dfd5dea | |
| parent | c536ccfd162fc8871838fa229012c562e3f8e0d9 (diff) | |
| download | openembedded-core-21f04b61973dd9029f0e6bff5445e31cd762bf32.tar.gz openembedded-core-21f04b61973dd9029f0e6bff5445e31cd762bf32.tar.bz2 openembedded-core-21f04b61973dd9029f0e6bff5445e31cd762bf32.zip | |
scriptutils: pass in logger as parameter
logger was not defined in scriptutils.py based on the
observation in python traceback.
Traceback (most recent call last):
File "/workdir/poky/scripts/devtool", line 351, in <module>
ret = main()
File "/workdir/poky/scripts/devtool", line 338, in main
ret = args.func(args, config, basepath, workspace)
File "/workdir/poky/scripts/lib/devtool/utilcmds.py", line 55, in
edit_recipe
return scriptutils.run_editor(find_recipe(args, config, basepath,
workspace))
File "/workdir/poky/scripts/lib/scriptutils.py", line 141, in
run_editor
logger.error("Execution of '%s' failed: %s" % (editor, exc))
NameError: name 'logger' is not defined
We pass in logger as parameter to run_editor() from where it has
been called (devtool/utilcmds.py and recipetool/newappend.py),
which both modules already has logger setup.
Signed-off-by: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | scripts/lib/devtool/utilcmds.py | 2 | ||||
| -rw-r--r-- | scripts/lib/recipetool/newappend.py | 2 | ||||
| -rw-r--r-- | scripts/lib/scriptutils.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/scripts/lib/devtool/utilcmds.py b/scripts/lib/devtool/utilcmds.py index 0437e6417c..938d88afc0 100644 --- a/scripts/lib/devtool/utilcmds.py +++ b/scripts/lib/devtool/utilcmds.py @@ -49,7 +49,7 @@ def edit_recipe(args, config, basepath, workspace): raise DevtoolError("Recipe file for %s is not under the workspace" % args.recipename) - return scriptutils.run_editor(recipefile) + return scriptutils.run_editor(recipefile, logger) def configure_help(args, config, basepath, workspace): diff --git a/scripts/lib/recipetool/newappend.py b/scripts/lib/recipetool/newappend.py index 0b63759d8c..decce83fac 100644 --- a/scripts/lib/recipetool/newappend.py +++ b/scripts/lib/recipetool/newappend.py @@ -74,7 +74,7 @@ def newappend(args): return 1 if args.edit: - return scriptutils.run_editor([append_path, recipe_path]) + return scriptutils.run_editor([append_path, recipe_path], logger) else: print(append_path) diff --git a/scripts/lib/scriptutils.py b/scripts/lib/scriptutils.py index b6217dc059..97854385d5 100644 --- a/scripts/lib/scriptutils.py +++ b/scripts/lib/scriptutils.py @@ -205,7 +205,7 @@ def fetch_url(tinfoil, srcuri, srcrev, destdir, logger, preserve_tmp=False): return checksums, tmpdir -def run_editor(fn): +def run_editor(fn, logger=None): if isinstance(fn, str): params = '"%s"' % fn else: |