summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-07-14 15:33:01 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-17 14:01:37 +0100
commit57a334c10a24938df2e1205495154fc0c1a0df7b (patch)
treecd0ebf96ea2734ef89df556709d596d3c02104e4
parentb6dd87f2a85300c1f621b4195e3f0357091bec33 (diff)
downloadpoky-57a334c10a24938df2e1205495154fc0c1a0df7b.tar.gz
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>
-rw-r--r--scripts/lib/wic/plugins/source/isoimage-isohybrid.py4
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 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):
204 """ 204 """
205 isodir = "%s/ISO/" % cr_workdir 205 isodir = "%s/ISO/" % cr_workdir
206 206
207 if os.path.exists(cr_workdir): 207 if os.path.exists(isodir):
208 shutil.rmtree(cr_workdir) 208 shutil.rmtree(isodir)
209 209
210 install_cmd = "install -d %s " % isodir 210 install_cmd = "install -d %s " % isodir
211 exec_cmd(install_cmd) 211 exec_cmd(install_cmd)