summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xscripts/devtool2
-rw-r--r--scripts/lib/devtool/standard.py3
2 files changed, 1 insertions, 4 deletions
diff --git a/scripts/devtool b/scripts/devtool
index 0100eb8360..fd4af9838a 100755
--- a/scripts/devtool
+++ b/scripts/devtool
@@ -157,7 +157,7 @@ def _enable_workspace_layer(workspacedir, config, basepath):
157 bblayers_conf = os.path.join(basepath, 'conf', 'bblayers.conf') 157 bblayers_conf = os.path.join(basepath, 'conf', 'bblayers.conf')
158 if not os.path.exists(bblayers_conf): 158 if not os.path.exists(bblayers_conf):
159 logger.error('Unable to find bblayers.conf') 159 logger.error('Unable to find bblayers.conf')
160 return -1 160 return
161 _, added = bb.utils.edit_bblayers_conf(bblayers_conf, workspacedir, config.workspace_path) 161 _, added = bb.utils.edit_bblayers_conf(bblayers_conf, workspacedir, config.workspace_path)
162 if added: 162 if added:
163 logger.info('Enabling workspace layer in bblayers.conf') 163 logger.info('Enabling workspace layer in bblayers.conf')
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index fb3cc78de0..14912a9454 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -417,9 +417,6 @@ def _check_preserve(config, recipename):
417 tf.write(line) 417 tf.write(line)
418 os.rename(newfile, origfile) 418 os.rename(newfile, origfile)
419 419
420 return False
421
422
423def modify(args, config, basepath, workspace): 420def modify(args, config, basepath, workspace):
424 """Entry point for the devtool 'modify' subcommand""" 421 """Entry point for the devtool 'modify' subcommand"""
425 import bb 422 import bb