mirror of
https://git.yoctoproject.org/poky
synced 2026-03-25 10:02:22 +01:00
devtool / recipetool: use common code for launching editor
Looking at Chris Larson's code for starting the user's editor for "recipetool newappend" it was slightly better than what I wrote for "devtool edit-recipe" in that it checks VISUAL as well as EDITOR and defaults to vi if neither are set, so break this out to its own function and call it from both places. The broken out version passes shell=True however in case it's a more complicated command rather than just a name of an executable. (From OE-Core rev: 184a256931e8cdc7bea97a905c4e67a435964de0) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
dd35f69340
commit
e54f9c159d
@@ -24,6 +24,7 @@ import tempfile
|
||||
import logging
|
||||
import argparse
|
||||
import subprocess
|
||||
import scriptutils
|
||||
from devtool import exec_build_env_command, setup_tinfoil, check_workspace_recipe, DevtoolError
|
||||
from devtool import parse_recipe
|
||||
|
||||
@@ -48,17 +49,7 @@ def edit_recipe(args, config, basepath, workspace):
|
||||
raise DevtoolError("Recipe file for %s is not under the workspace" %
|
||||
args.recipename)
|
||||
|
||||
editor = os.environ.get('EDITOR', None)
|
||||
if not editor:
|
||||
raise DevtoolError("EDITOR environment variable not set")
|
||||
|
||||
import subprocess
|
||||
try:
|
||||
subprocess.check_call('%s "%s"' % (editor, recipefile), shell=True)
|
||||
except subprocess.CalledProcessError as e:
|
||||
return e.returncode
|
||||
|
||||
return 0
|
||||
return scriptutils.run_editor(recipefile)
|
||||
|
||||
|
||||
def configure_help(args, config, basepath, workspace):
|
||||
|
||||
Reference in New Issue
Block a user