aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/lib/wic/imager
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/lib/wic/imager')
-rw-r--r--scripts/lib/wic/imager/baseimager.py4
-rw-r--r--scripts/lib/wic/imager/direct.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/lib/wic/imager/baseimager.py b/scripts/lib/wic/imager/baseimager.py
index 67a2d0116b..4abcabca4b 100644
--- a/scripts/lib/wic/imager/baseimager.py
+++ b/scripts/lib/wic/imager/baseimager.py
@@ -132,9 +132,9 @@ class BaseImageCreator(object):
os.makedirs(self.workdir)
self.__builddir = tempfile.mkdtemp(dir=self.workdir,
prefix="imgcreate-")
- except OSError, (err, msg):
+ except OSError as err:
raise CreatorError("Failed create build directory in %s: %s" %
- (self.tmpdir, msg))
+ (self.tmpdir, err))
def __setup_tmpdir(self):
if not self.enabletmpfs:
diff --git a/scripts/lib/wic/imager/direct.py b/scripts/lib/wic/imager/direct.py
index d68fd2a8c5..74ebbe79b6 100644
--- a/scripts/lib/wic/imager/direct.py
+++ b/scripts/lib/wic/imager/direct.py
@@ -327,7 +327,7 @@ class DirectImageCreator(BaseImageCreator):
parts = self._get_parts()
- for disk_name, disk in self.__image.disks.items():
+ for disk_name in self.__image.disks:
extension = "direct" + {"gzip": ".gz",
"bzip2": ".bz2",
"xz": ".xz",