[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5042/8267] wic/direct.py: Avoid exception if using multiple rawcopy/no-table entries.

[Emmanuele Bassi <ebassi src gnome org>]

commit 0cfcdf2e95fafa9ff9e7b0490d1860a87ba83744
Author: Kristian Amlie <kristian amlie mender io>
Date:   Thu Mar 9 15:37:09 2017 +0100

    wic/direct.py: Avoid exception if using multiple rawcopy/no-table entries.
    
    If we are both having a bootloader and a U-Boot environment file, we
    can end up with two entries using "--source rawcopy" and "--no-table",
    and since they reuse the same file [1], their cleanup handlers will
    try to delete the same file twice. So make sure we only do it once.
    
    [1] Although they reuse the same file, the resulting output is
    correct, so it appears the file is accessed in properly sequential
    order.
    
    (From OE-Core rev: f1a3eac376c4600cdb128d870ad9b7e9d51ed9c0)
    
    Signed-off-by: Kristian Amlie <kristian amlie mender io>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/wic/plugins/imager/direct.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py
index b7e324a..235eb24 100644
--- a/scripts/lib/wic/plugins/imager/direct.py
+++ b/scripts/lib/wic/plugins/imager/direct.py
@@ -547,7 +547,7 @@ class PartitionedImage():
 
     def cleanup(self):
         # remove partition images
-        for image in self.partimages:
+        for image in set(self.partimages):
             os.remove(image)
 
     def assemble(self):