diff options
Diffstat (limited to 'scripts/lib/wic/imager')
| -rw-r--r-- | scripts/lib/wic/imager/baseimager.py | 4 | ||||
| -rw-r--r-- | scripts/lib/wic/imager/direct.py | 2 |
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): | |||
| 132 | os.makedirs(self.workdir) | 132 | os.makedirs(self.workdir) |
| 133 | self.__builddir = tempfile.mkdtemp(dir=self.workdir, | 133 | self.__builddir = tempfile.mkdtemp(dir=self.workdir, |
| 134 | prefix="imgcreate-") | 134 | prefix="imgcreate-") |
| 135 | except OSError, (err, msg): | 135 | except OSError as err: |
| 136 | raise CreatorError("Failed create build directory in %s: %s" % | 136 | raise CreatorError("Failed create build directory in %s: %s" % |
| 137 | (self.tmpdir, msg)) | 137 | (self.tmpdir, err)) |
| 138 | 138 | ||
| 139 | def __setup_tmpdir(self): | 139 | def __setup_tmpdir(self): |
| 140 | if not self.enabletmpfs: | 140 | 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): | |||
| 327 | 327 | ||
| 328 | parts = self._get_parts() | 328 | parts = self._get_parts() |
| 329 | 329 | ||
| 330 | for disk_name, disk in self.__image.disks.items(): | 330 | for disk_name in self.__image.disks: |
| 331 | extension = "direct" + {"gzip": ".gz", | 331 | extension = "direct" + {"gzip": ".gz", |
| 332 | "bzip2": ".bz2", | 332 | "bzip2": ".bz2", |
| 333 | "xz": ".xz", | 333 | "xz": ".xz", |
