diff options
| author |   Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com> | 2017-06-28 09:59:17 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-21 12:36:36 +0100 |
| commit | c536ccfd162fc8871838fa229012c562e3f8e0d9 (patch) | |
| tree | a8ab0fcbf9666eb5d499cb11b380db75c77d646a /scripts/lib/scriptutils.py | |
| parent | 35403ba3707c3c8dd94bcc557eef6f7c66696bc5 (diff) | |
| download | openembedded-core-contrib-c536ccfd162fc8871838fa229012c562e3f8e0d9.tar.gz | |
scriptutils: exit politely when no text editor available
devtool edit-recipe now has ugly tracebacks if executed without an
editor available. This happens in the build containers whenever no
text editor is available.
subprocess.check_call will run text editing command with recipe path
provided. It will wait for command to complete. If the return code
was zero then return, otherwise raise CalledProcessError exception.
This enhancement will suppress the traceback by catching the exception
and prompt the error messages in a proper manner shown below:
pokyuser@59c99c507238:/workdir/docker-dbg$ devtool edit-recipe ifupdown
/bin/sh: 1: vi: not found
ERROR: Execution of 'vi' failed: Command 'vi
"/workdir/docker-dbg/workspace/recipes/ifupdown/ifupdown_0.8.16.bb"'
returned non-zero exit status 127
[YOCTO #11434]
Signed-off-by: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'scripts/lib/scriptutils.py')
| -rw-r--r-- | scripts/lib/scriptutils.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/lib/scriptutils.py b/scripts/lib/scriptutils.py index 1005dd495a..b6217dc059 100644 --- a/scripts/lib/scriptutils.py +++ b/scripts/lib/scriptutils.py @@ -216,8 +216,8 @@ def run_editor(fn): editor = os.getenv('VISUAL', os.getenv('EDITOR', 'vi')) try: return subprocess.check_call('%s %s' % (editor, params), shell=True) - except OSError as exc: - logger.error("Execution of editor '%s' failed: %s", editor, exc) + except subprocess.CalledProcessError as exc: + logger.error("Execution of '%s' failed: %s" % (editor, exc)) return 1 def is_src_url(param): |