[oe-commits] [openembedded-core] 06/43: wic: rootfs: make copied rootfs unique

[git at git.openembedded.org]

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

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

commit cb370194ebac9509018d85d62bc888a2ffe0a6a4
Author: Ed Bartosh <ed.bartosh at linux.intel.com>
AuthorDate: Mon Jun 26 17:10:55 2017 +0300

    wic: rootfs: make copied rootfs unique
    
    Used unique suffix (line number from .wks file) for the
    copied rootfs directory to avoid possible conflicts.
    
    Signed-off-by: Ed Bartosh <ed.bartosh at linux.intel.com>
---
 scripts/lib/wic/plugins/source/rootfs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py
index e438158..aec720f 100644
--- a/scripts/lib/wic/plugins/source/rootfs.py
+++ b/scripts/lib/wic/plugins/source/rootfs.py
@@ -88,7 +88,7 @@ class RootfsPlugin(SourcePlugin):
         if part.exclude_path is not None:
             # We need a new rootfs directory we can delete files from. Copy to
             # workdir.
-            new_rootfs = os.path.realpath(os.path.join(cr_workdir, "rootfs"))
+            new_rootfs = os.path.realpath(os.path.join(cr_workdir, "rootfs%d" % part.lineno))
 
             if os.path.lexists(new_rootfs):
                 shutil.rmtree(os.path.join(new_rootfs))

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