aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-01-26 15:53:56 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-26 18:04:35 +0000
commit0a39b907ff997c3a62c92ab22325c726b612de5b (patch)
tree6e408eaa50209ce42c852a5dc68d2ddc5b06f84f /scripts
parentb3a44951a74fe58714b72e71a7a558b67a71e1e3 (diff)
downloadopenembedded-core-contrib-0a39b907ff997c3a62c92ab22325c726b612de5b.tar.gz
devtool: add: warn if modified recipe found in attic directory
If a recipe generated by "devtool add" has been modified since then when you run "devtool reset", it will be moved into the "attic" subdirectory of the workspace in case those modifications need to be preserved. It seems natural that if those modifications were worth preserving we should warn the user if such a file exists when they run "devtool add" to create the same recipe again, so they can pick up where they left off if they want to. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/devtool/standard.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 83ec7d8efa..187dff201f 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -190,6 +190,9 @@ def add(args, config, basepath, workspace):
shutil.move(recipes[0], recipefile)
else:
raise DevtoolError('Command \'%s\' did not create any recipe file:\n%s' % (e.command, e.stdout))
+ attic_recipe = os.path.join(config.workspace_path, 'attic', os.path.basename(recipefile))
+ if os.path.exists(attic_recipe):
+ logger.warn('A modified recipe from a previous invocation exists in %s - you may wish to move this over the top of the new recipe if you had changes in it that you want to continue with' % attic_recipe)
finally:
if tmpsrcdir and os.path.exists(tmpsrcdir):
shutil.rmtree(tmpsrcdir)