From 3b4f65968ec87961e156995f95a501d1783fb630 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 23 Nov 2015 09:39:39 +1300 Subject: 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 master rev: 65354e066f87df7d3138adceb22d6a05d1685904) (From OE-Core rev: c44d41b0dec7457c4347a00b21d8b5bd24a9b887) Signed-off-by: Paul Eggleton Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- scripts/lib/devtool/standard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index c5c647b2f3..d9b624d4c7 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -456,7 +456,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: -- cgit v1.2.3-54-g00ecf