[oe-commits] [openembedded-core] 14/64: wic: isoimage: do not remove temp directory

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit fc12ce9d1b92cc0104cf456af1e3d5f146b9219d
Author: Ed Bartosh <ed.bartosh at linux.intel.com>
AuthorDate: Fri Jul 14 15:33:01 2017 +0300

    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 at linux.intel.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 scripts/lib/wic/plugins/source/isoimage-isohybrid.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
index 85f35f7..ffa5429 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)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.