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>
This commit is contained in:
Kristian Amlie 2017-03-09 15:37:09 +01:00 committed by Richard Purdie
parent d5df9dd30f
commit 0cfcdf2e95
1 changed files with 1 additions and 1 deletions

View File

@ -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):