diff options
Diffstat (limited to 'scripts/lib/wic/imager')
-rw-r--r-- | scripts/lib/wic/imager/baseimager.py | 8 | ||||
-rw-r--r-- | scripts/lib/wic/imager/direct.py | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/scripts/lib/wic/imager/baseimager.py b/scripts/lib/wic/imager/baseimager.py index 2075358bdc..0afbc2cf0c 100644 --- a/scripts/lib/wic/imager/baseimager.py +++ b/scripts/lib/wic/imager/baseimager.py | |||
@@ -42,7 +42,7 @@ class BaseImageCreator(object): | |||
42 | def __del__(self): | 42 | def __del__(self): |
43 | self.cleanup() | 43 | self.cleanup() |
44 | 44 | ||
45 | def __init__(self, createopts = None): | 45 | def __init__(self, createopts=None): |
46 | """Initialize an ImageCreator instance. | 46 | """Initialize an ImageCreator instance. |
47 | 47 | ||
48 | ks -- a pykickstart.KickstartParser instance; this instance will be | 48 | ks -- a pykickstart.KickstartParser instance; this instance will be |
@@ -131,8 +131,8 @@ class BaseImageCreator(object): | |||
131 | self.workdir = os.path.join(self.tmpdir, "build") | 131 | self.workdir = os.path.join(self.tmpdir, "build") |
132 | if not os.path.exists(self.workdir): | 132 | if not os.path.exists(self.workdir): |
133 | os.makedirs(self.workdir) | 133 | os.makedirs(self.workdir) |
134 | self.__builddir = tempfile.mkdtemp(dir = self.workdir, | 134 | self.__builddir = tempfile.mkdtemp(dir=self.workdir, |
135 | prefix = "imgcreate-") | 135 | prefix="imgcreate-") |
136 | except OSError, (err, msg): | 136 | except OSError, (err, msg): |
137 | raise CreatorError("Failed create build directory in %s: %s" % | 137 | raise CreatorError("Failed create build directory in %s: %s" % |
138 | (self.tmpdir, msg)) | 138 | (self.tmpdir, msg)) |
@@ -178,7 +178,7 @@ class BaseImageCreator(object): | |||
178 | 178 | ||
179 | self._cleanup() | 179 | self._cleanup() |
180 | 180 | ||
181 | shutil.rmtree(self.__builddir, ignore_errors = True) | 181 | shutil.rmtree(self.__builddir, ignore_errors=True) |
182 | self.__builddir = None | 182 | self.__builddir = None |
183 | 183 | ||
184 | self.__clean_tmpdir() | 184 | self.__clean_tmpdir() |
diff --git a/scripts/lib/wic/imager/direct.py b/scripts/lib/wic/imager/direct.py index b236c7a7d0..c1e5f09eee 100644 --- a/scripts/lib/wic/imager/direct.py +++ b/scripts/lib/wic/imager/direct.py | |||
@@ -269,11 +269,11 @@ class DirectImageCreator(BaseImageCreator): | |||
269 | p.source_file, | 269 | p.source_file, |
270 | p.fstype, | 270 | p.fstype, |
271 | p.label, | 271 | p.label, |
272 | fsopts = p.fsopts, | 272 | fsopts=p.fsopts, |
273 | boot = p.active, | 273 | boot=p.active, |
274 | align = p.align, | 274 | align=p.align, |
275 | no_table = p.no_table, | 275 | no_table=p.no_table, |
276 | part_type = p.part_type) | 276 | part_type=p.part_type) |
277 | 277 | ||
278 | self._restore_fstab(fstab) | 278 | self._restore_fstab(fstab) |
279 | 279 | ||