]> code.ossystems Code Review - openembedded-core.git/commitdiff
wic: isoimage: do not remove temp directory
authorEd Bartosh <ed.bartosh@linux.intel.com>
Fri, 14 Jul 2017 12:33:01 +0000 (15:33 +0300)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 17 Jul 2017 12:48:54 +0000 (13:48 +0100)
Removed isodir subrdirectory instead of removing temporary
working directory as working directory can contain copy of
rootfs partition and shouldn't be removed by any plugin.

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
scripts/lib/wic/plugins/source/isoimage-isohybrid.py

index 85f35f7fbe444ff571e068ddc1aba92cd7b71cd6..ffa542996221f429a4402e18303c3147068e0e40 100644 (file)
@@ -204,8 +204,8 @@ class IsoImagePlugin(SourcePlugin):
         """
         isodir = "%s/ISO/" % cr_workdir
 
-        if os.path.exists(cr_workdir):
-            shutil.rmtree(cr_workdir)
+        if os.path.exists(isodir):
+            shutil.rmtree(isodir)
 
         install_cmd = "install -d %s " % isodir
         exec_cmd(install_cmd)