From f1a3eac376c4600cdb128d870ad9b7e9d51ed9c0 Mon Sep 17 00:00:00 2001 From: Kristian Amlie Date: Thu, 9 Mar 2017 15:37:09 +0100 Subject: 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. Signed-off-by: Kristian Amlie Signed-off-by: Ross Burton --- scripts/lib/wic/plugins/imager/direct.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/lib') diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py index b7e324aab6..235eb24f59 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): -- cgit 1.2.3-korg