MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

devtool: reset: print source tree base path

Browse Source 
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.

(From OE-Core rev: 9e8808099046478e98c6cf1903dc6787d69132fc)

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>
This commit is contained in:
Paul Eggleton 2017-09-29 16:19:28 +13:00 committed by Richard Purdie
parent 73a25acd20
commit d5ffd41a93
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/lib/devtool/standard.py
View File

@ -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)