summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-11-22 20:39:39 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-01 21:32:03 (GMT)
commit6a52c738ba0734f0f37b45af7e6836b2fe06fe8a (patch)
tree49c3b340e82d7c1a40bb80d9adc4379fbd90d70b
parent44ef78a46b1b4a78379203eb104455fef6d9e0fc (diff)
downloadpoky-6a52c738ba0734f0f37b45af7e6836b2fe06fe8a.tar.gz
devtool: upgrade: fix removing other recipes from workspace on reset
If you did a "devtool add" followed by "devtool upgrade" and then did a "devtool reset" on the recipe you upgraded, the first recipe would also be deleted from the workspace - this was because we were erroneously adding the entire "recipes" subdirectory and its contents to be tracked for removal on reset. Remove the unnecessary call to os.path.dirname() that caused this. (From OE-Core rev: 65354e066f87df7d3138adceb22d6a05d1685904) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/devtool/standard.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 8efd262..9fd936f 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -505,7 +505,7 @@ def _add_md5(config, recipename, filename):
505 f.write('%s|%s|%s\n' % (recipename, os.path.relpath(fn, config.workspace_path), md5)) 505 f.write('%s|%s|%s\n' % (recipename, os.path.relpath(fn, config.workspace_path), md5))
506 506
507 if os.path.isdir(filename): 507 if os.path.isdir(filename):
508 for root, _, files in os.walk(os.path.dirname(filename)): 508 for root, _, files in os.walk(filename):
509 for f in files: 509 for f in files:
510 addfile(os.path.join(root, f)) 510 addfile(os.path.join(root, f))
511 else: 511 else: