imgcreate/fs.py | 3 +++
imgcreate/live.py | 5 ++++-
2 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 2315f1a3cfbd38257e86b9f785f11e9a99784d67
Author: Jeremy Katz <katzj(a)redhat.com>
Date: Mon Aug 17 09:50:08 2009 -0400
Apparently the python traceback isn't clear enough (#517841)
diff --git a/imgcreate/live.py b/imgcreate/live.py
index b98f7b3..773d2c2 100644
--- a/imgcreate/live.py
+++ b/imgcreate/live.py
@@ -171,7 +171,10 @@ class LiveImageCreatorBase(LoopImageCreator):
"LiveOS/ext3fs.img nor os.img exist" %
base_on)
- shutil.copyfile(os_image, self._image)
+ try:
+ shutil.copyfile(os_image, self._image)
+ except IOError, e
+ raise CreatorError("Failed to copy base live image to %s for
modification: %s" %(self._image, e))
finally:
squashloop.cleanup()
isoloop.cleanup()
commit 7a62ff24c4f1f7e46326210d0514e4b71de5772b
Author: Jeremy Katz <katzj(a)redhat.com>
Date: Mon Aug 17 09:47:14 2009 -0400
Add a sleep to try to avoid tracebacks with snapshot removal (#506644)
diff --git a/imgcreate/fs.py b/imgcreate/fs.py
index a9512f2..31e5ca3 100644
--- a/imgcreate/fs.py
+++ b/imgcreate/fs.py
@@ -26,6 +26,7 @@ import random
import string
import logging
import tempfile
+import time
from imgcreate.errors import *
@@ -516,6 +517,8 @@ class DeviceMapperSnapshot(object):
if not self.__created:
return
+ # sleep to try to avoid any dm shenanigans
+ time.sleep(2)
rc = subprocess.call(["/sbin/dmsetup", "remove",
self.__name])
if not ignore_errors and rc != 0:
raise SnapshotError("Could not remove snapshot device")
Show replies by date