From: Ed Bartosh <ed.bartosh@linux.intel.com>
Date: Fri, 14 Jul 2017 12:33:01 +0000 (+0300)
Subject: wic: isoimage: do not remove temp directory
X-Git-Tag: uninative-1.7~194
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=fc12ce9d1b92cc0104cf456af1e3d5f146b9219d;p=openembedded-core.git

wic: isoimage: do not remove temp directory

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

diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
index 85f35f7fbe..ffa5429962 100644
--- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
+++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
@@ -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)