diff options
| -rwxr-xr-x | mic/conf.py | 13 | ||||
| -rwxr-xr-x | mic/imager/baseimager.py | 2 | ||||
| -rwxr-xr-x | mic/utils/misc.py | 9 |
3 files changed, 22 insertions, 2 deletions
diff --git a/mic/conf.py b/mic/conf.py index 33e534f..9299cfe 100755 --- a/mic/conf.py +++ b/mic/conf.py @@ -227,6 +227,12 @@ class ConfigMgr(object): self.create['release'], self.create['name']) self.create['name'] = self.create['release'] + '_' + self.create['name'] + if self.create['pack_to'] is not None: + if '@NAME@' in self.create['pack_to']: + self.create['pack_to'] = self.create['pack_to'].replace('@NAME@', self.create['name']) + self.create['name'] = misc.strip_archive_suffix(self.create['pack_to']) + if self.create['name'] is None: + raise errors.CreatorError("Not supported archive file format: %s" % self.create['pack_to']) if not self.create['logfile']: self.create['logfile'] = os.path.join(self.create['destdir'], @@ -234,6 +240,13 @@ class ConfigMgr(object): self.create['releaselog'] = True self.set_logfile() + elif self.create['pack_to'] is not None: + if '@NAME@' in self.create['pack_to']: + self.create['pack_to'] = self.create['pack_to'].replace('@NAME@', self.create['name']) + self.create['name'] = misc.strip_archive_suffix(self.create['pack_to']) + if self.create['name'] is None: + raise errors.CreatorError("Not supported archive file format: %s" % self.create['pack_to']) + msger.info("Retrieving repo metadata:") ksrepos = kickstart.get_repos(ks, self.create['extrarepos'], diff --git a/mic/imager/baseimager.py b/mic/imager/baseimager.py index a1ddb6a..ef86f0f 100755 --- a/mic/imager/baseimager.py +++ b/mic/imager/baseimager.py @@ -116,8 +116,6 @@ class BaseImageCreator(object): self.destdir = os.path.abspath(os.path.expanduser(self.destdir)) if self.pack_to: - if '@NAME@' in self.pack_to: - self.pack_to = self.pack_to.replace('@NAME@', self.name) (tar, ext) = os.path.splitext(self.pack_to) if ext in (".gz", ".bz2", ".lzo", ".bz") and tar.endswith(".tar"): ext = ".tar" + ext diff --git a/mic/utils/misc.py b/mic/utils/misc.py index 5aa5b16..be14d01 100755 --- a/mic/utils/misc.py +++ b/mic/utils/misc.py @@ -41,6 +41,7 @@ except ImportError: xmlparse = cElementTree.parse from mic import msger +from mic.archive import get_archive_suffixes from mic.utils.errors import CreatorError, SquashfsError from mic.utils.fs_related import find_binary_path, makedirs from mic.utils.grabber import myurlgrab @@ -1044,3 +1045,11 @@ def strip_end(text, suffix): if not text.endswith(suffix): return text return text[:-len(suffix)] + +def strip_archive_suffix(filename): + for suffix in get_archive_suffixes(): + if filename.endswith(suffix): + return filename[:-len(suffix)] + else: + msger.warning("Not supported archive file format: %s" % filename) + return None |