From: Paul Eggleton Date: Sun, 22 Nov 2015 20:39:39 +0000 (+1300) Subject: devtool: upgrade: fix removing other recipes from workspace on reset X-Git-Tag: 2016-4~2160 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=65354e066f87df7d3138adceb22d6a05d1685904;p=openembedded-core.git 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 Signed-off-by: Ross Burton --- 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: