From: "Andreas J. Reichel" <andreas.reichel@tngtech.com>
To: openembedded-core@lists.openembedded.org
Cc: Jan Kiszka <jan.kiszka@siemens.com>,
Daniel Wagner <daniel.wagner@siemens.com>,
Andreas Reichel <andreas.reichel.ext@siemens.com>
Subject: [wic patch 1/5] wic: Catch errors during image files clean-up
Date: Fri, 21 Apr 2017 14:11:41 +0200 [thread overview]
Message-ID: <20170421121145.9797-2-andreas.reichel@tngtech.com> (raw)
In-Reply-To: <20170421121145.9797-1-andreas.reichel@tngtech.com>
Handle exception if a file could not be deleted during clean-up of
unwanted files, thus preventing a failure of wic in this case.
Signed-off-by: Andreas Reichel <andreas.reichel.ext@siemens.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Daniel Wagner <daniel.wagner@siemens.com>
---
scripts/lib/wic/plugins/imager/direct.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py
index f2e6127331..d6b47ff0bb 100644
--- a/scripts/lib/wic/plugins/imager/direct.py
+++ b/scripts/lib/wic/plugins/imager/direct.py
@@ -541,7 +541,12 @@ class PartitionedImage():
def cleanup(self):
# remove partition images
for image in set(self.partimages):
- os.remove(image)
+ try:
+ os.remove(image)
+ except IOError as e:
+ logger.warning(
+ "Could not delete file. {0}: I/O error ({1}): {2}\n".format(
+ image, e.errno, e.strerror))
def assemble(self):
logger.debug("Installing partitions")
--
2.11.0
next prev parent reply other threads:[~2017-04-21 12:16 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-21 12:11 [wic patch 0/5] Add option to wic and use argparse Andreas J. Reichel
2017-04-21 12:11 ` Andreas J. Reichel [this message]
2017-05-02 12:56 ` [wic patch 1/5] wic: Catch errors during image files clean-up Ed Bartosh
2017-05-03 8:45 ` Andreas Reichel
2017-05-03 10:32 ` Ed Bartosh
2017-04-21 12:11 ` [wic patch 2/5] wic: Use argparse instead of optparse Andreas J. Reichel
2017-04-23 19:58 ` Burton, Ross
2017-04-26 10:34 ` Andreas Reichel
2017-04-26 13:03 ` Burton, Ross
2017-04-21 12:11 ` [wic patch 3/5] wic: Add missing text to usage and help strings Andreas J. Reichel
2017-04-21 12:11 ` [wic patch 4/5] wic: Add option to keep partition images Andreas J. Reichel
2017-04-21 12:11 ` [wic patch 5/5] wic: Use enum like dicts for string constants Andreas J. Reichel
2017-05-02 13:36 ` Ed Bartosh
2017-05-03 8:47 ` Andreas Reichel
2017-05-03 12:18 ` Ed Bartosh
2017-05-02 14:37 ` [wic patch 0/5] Add option to wic and use argparse Ed Bartosh
2017-05-03 8:49 ` Andreas Reichel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170421121145.9797-2-andreas.reichel@tngtech.com \
--to=andreas.reichel@tngtech.com \
--cc=andreas.reichel.ext@siemens.com \
--cc=daniel.wagner@siemens.com \
--cc=jan.kiszka@siemens.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.