[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7022/8267] wic: rootfs: make copied rootfs unique

[Emmanuele Bassi <ebassi src gnome org>]

commit 092f4fafaa051a254588f8c9eee1db66e6aaacab
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Fri Jul 28 12:29:26 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.
    
    (From OE-Core rev: 01efc234a8caab67ed3138ab2de9bbd82ce97b44)
    
    Signed-off-by: Ed Bartosh <ed bartosh linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/wic/plugins/source/rootfs.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
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))