[oe-commits] [openembedded-core] 10/40: scriptutils: exit politely when no text editor available

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit c536ccfd162fc8871838fa229012c562e3f8e0d9
Author: Chang Rebecca Swee Fun <rebecca.swee.fun.chang at intel.com>
AuthorDate: Wed Jun 28 09:59:17 2017 +0800

    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 at 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 at intel.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 scripts/lib/scriptutils.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/lib/scriptutils.py b/scripts/lib/scriptutils.py
index 1005dd4..b6217dc 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):

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.