devtool: use cp instead of shutil.copytree
Copied layers with 'cp -a' instead of calling shutil.copytree as copytree fails to copy broken symlinks. More pythonic fix would be to use copytree with 'ignore' parameter, but this could slow down copying complex directory structures. [YOCTO #8825] (From OE-Core rev: e5b841420b9fdd33829f7665a62cd06a3017f7e6) Signed-off-by: Ed Bartosh <ed.bartosh@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:
parent
d6e7b5b1b1
commit
23302ee03a
|
@ -128,7 +128,10 @@ def sdk_update(args, config, basepath, workspace):
|
|||
new_layers_dir = os.path.join(args.updateserver, 'layers')
|
||||
old_layers_dir = os.path.join(basepath, 'layers')
|
||||
shutil.rmtree(old_layers_dir)
|
||||
shutil.copytree(new_layers_dir, old_layers_dir)
|
||||
ret = subprocess.call("cp -a %s %s" % (new_layers_dir, old_layers_dir), shell=True)
|
||||
if ret != 0:
|
||||
logger.error("Copying %s to %s failed" % (new_layers_dir, old_layers_dir))
|
||||
return ret
|
||||
else:
|
||||
# devtool sdk-update http://myhost/sdk
|
||||
tmpsdk_dir = '/tmp/sdk-ext'
|
||||
|
|
Loading…
Reference in New Issue