almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

livemedia-creator: Use imgutils.copytree for results (#1362157)

Browse Source 
commit 5da9f5c179 cleaned up the resultdir
handling, but didn't take into account that on master shutil.copytree
was switched to imgutil.copytree which doesn't care if the empty
directory exists or not.

Resolves: rhbz#1362157
This commit is contained in:
Brian C. Lane 2016-08-01 14:12:02 -07:00
parent 8110952abb
commit c2be4bdfc8
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/sbin/livemedia-creator
View File

@ -56,6 +56,7 @@ from pylorax.sysutils import joinpaths, remove
from pylorax.imgutils import PartitionMount, mksparse, mkext4img, loop_detach from pylorax.imgutils import PartitionMount, mksparse, mkext4img, loop_detach
from pylorax.imgutils import get_loop_name, dm_detach, mount, umount, Mount from pylorax.imgutils import get_loop_name, dm_detach, mount, umount, Mount
from pylorax.imgutils import mksquashfs, mktar, mkrootfsimg, mkqcow2 from pylorax.imgutils import mksquashfs, mktar, mkrootfsimg, mkqcow2
from pylorax.imgutils import copytree
from pylorax.executils import execWithRedirect, execWithCapture, runcmd from pylorax.executils import execWithRedirect, execWithCapture, runcmd
# no-virt mode doesn't need libvirt, so make it optional # no-virt mode doesn't need libvirt, so make it optional
@ -1349,7 +1350,7 @@ if __name__ == '__main__':
umount(mounted_sysroot_boot_dir) umount(mounted_sysroot_boot_dir)
if opts.result_dir != opts.tmp and result_dir: if opts.result_dir != opts.tmp and result_dir:
shutil.copytree( result_dir, opts.result_dir ) copytree(result_dir, opts.result_dir, preserve=False)
shutil.rmtree( result_dir ) shutil.rmtree( result_dir )
log.info("SUMMARY") log.info("SUMMARY")