Hi Paul, On Wed, 2015-06-17 at 10:36 +0100, Paul Eggleton wrote: > On Thursday 11 June 2015 14:34:15 Markus Lehtonen wrote: > > Signed-off-by: Markus Lehtonen <markus.lehto...@linux.intel.com> > > --- > > scripts/devtool | 1 - > > scripts/lib/devtool/standard.py | 3 --- > > 2 files changed, 4 deletions(-) > > > > diff --git a/scripts/devtool b/scripts/devtool > > index 0100eb8..307846a 100755 > > --- a/scripts/devtool > > +++ b/scripts/devtool > > @@ -157,7 +157,6 @@ 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 > > I appreciate the actually returned value might not be used, but simply > dropping the return entirely allows the function to continue after the error, > which is wrong.
Uh oh, stupid mistake. Thanks for spotting that! You can find a fixed patch, attached. I also pushed a fixed version of the patchset to git://git.openembedded.org/openembedded-core-contrib marquiz/devtool/refactor Thanks, Markus
From 30401a4f075057e0c8eca9aaaae7e45591baf7c4 Mon Sep 17 00:00:00 2001 From: Markus Lehtonen <markus.lehto...@linux.intel.com> Date: Wed, 27 May 2015 17:40:49 +0300 Subject: [PATCH v3 09/10] devtool: remove some unused return values Signed-off-by: Markus Lehtonen <markus.lehto...@linux.intel.com> --- scripts/devtool | 2 +- scripts/lib/devtool/standard.py | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/scripts/devtool b/scripts/devtool index 0100eb8..fd4af98 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 fb3cc78..14912a9 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 -- 2.1.4
-- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core