diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-11-23 09:39:39 +1300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-01 21:30:53 +0000 |
| commit | 65354e066f87df7d3138adceb22d6a05d1685904 (patch) | |
| tree | 43d95832a2a5e7441dccc4183a295c3ac4b46c04 /scripts | |
| parent | 0731c5a9e98f7b7f6e5ada9bbb99acb3f5884516 (diff) | |
| download | openembedded-core-65354e066f87df7d3138adceb22d6a05d1685904.tar.gz openembedded-core-65354e066f87df7d3138adceb22d6a05d1685904.tar.bz2 openembedded-core-65354e066f87df7d3138adceb22d6a05d1685904.zip | |
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.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/devtool/standard.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 8efd2628fd..9fd936f146 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -505,7 +505,7 @@ def _add_md5(config, recipename, filename): f.write('%s|%s|%s\n' % (recipename, os.path.relpath(fn, config.workspace_path), md5)) if os.path.isdir(filename): - for root, _, files in os.walk(os.path.dirname(filename)): + for root, _, files in os.walk(filename): for f in files: addfile(os.path.join(root, f)) else: |