[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6742/8267] wic: isoimage: do not remove temp directory

[Emmanuele Bassi <ebassi src gnome org>]

commit 57a334c10a24938df2e1205495154fc0c1a0df7b
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   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.
    
    (From OE-Core rev: fc12ce9d1b92cc0104cf456af1e3d5f146b9219d)
    
    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>

 .../lib/wic/plugins/source/isoimage-isohybrid.py   |    4 ++--
 1 files 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)