]> code.ossystems Code Review - openembedded-core.git/commit
wic/direct.py: Avoid exception if using multiple rawcopy/no-table entries.
authorKristian Amlie <kristian.amlie@mender.io>
Thu, 9 Mar 2017 14:37:09 +0000 (15:37 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 11 Mar 2017 16:08:49 +0000 (16:08 +0000)
commitf1a3eac376c4600cdb128d870ad9b7e9d51ed9c0
tree5e1b14f54a0194579de91f6e62e5cfd6116848e3
parent12aa82b8b07b03d20e63479469faca6562c78a05
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 <kristian.amlie@mender.io>
Signed-off-by: Ross Burton <ross.burton@intel.com>
scripts/lib/wic/plugins/imager/direct.py