From 9e8808099046478e98c6cf1903dc6787d69132fc Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Fri, 29 Sep 2017 16:19:28 +1300 Subject: devtool: reset: print source tree base path If S points to a subdirectory of the source rather than the "base" of the source tree then print that rather than the subdirectory path when telling the user they need to remove the source tree, since that is the directory that they will need to remove. Signed-off-by: Paul Eggleton Signed-off-by: Ross Burton --- scripts/lib/devtool/standard.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'scripts') diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index b6e532bcd3..9bd2d8613d 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -1620,16 +1620,16 @@ def _reset(recipes, no_clean, config, basepath, workspace): # We don't automatically create this dir next to appends, but the user can preservedir(os.path.join(config.workspace_path, 'appends', pn)) - srctree = workspace[pn]['srctree'] - if os.path.isdir(srctree): - if os.listdir(srctree): + srctreebase = workspace[pn]['srctreebase'] + if os.path.isdir(srctreebase): + if os.listdir(srctreebase): # We don't want to risk wiping out any work in progress logger.info('Leaving source tree %s as-is; if you no ' 'longer need it then please delete it manually' - % srctree) + % srctreebase) else: # This is unlikely, but if it's empty we can just remove it - os.rmdir(srctree) + os.rmdir(srctreebase) clean_preferred_provider(pn, config.workspace_path) -- cgit 1.2.3-korg