diff options
-rwxr-xr-x | scripts/devtool | 2 | ||||
-rw-r--r-- | scripts/lib/devtool/standard.py | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/scripts/devtool b/scripts/devtool index 0100eb8360b..fd4af9838a9 100755 --- a/scripts/devtool +++ b/scripts/devtool @@ -157,7 +157,7 @@ def _enable_workspace_layer(workspacedir, config, basepath): bblayers_conf = os.path.join(basepath, 'conf', 'bblayers.conf') if not os.path.exists(bblayers_conf): logger.error('Unable to find bblayers.conf') - return -1 + return _, added = bb.utils.edit_bblayers_conf(bblayers_conf, workspacedir, config.workspace_path) if added: logger.info('Enabling workspace layer in bblayers.conf') diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index fb3cc78de03..14912a94547 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -417,9 +417,6 @@ def _check_preserve(config, recipename): tf.write(line) os.rename(newfile, origfile) - return False - - def modify(args, config, basepath, workspace): """Entry point for the devtool 'modify' subcommand""" import bb |