From ec9d293440b9769a195e2193e98cd28bb41408f2 Mon Sep 17 00:00:00 2001 From: Gui Chen Date: Wed, 14 May 2014 01:57:26 -0400 Subject: [PATCH] relocate create.name to conf module Change-Id: Id3e8d2cbf0a4e08ecfbe7941c4967206cd40cd88 Signed-off-by: Gui Chen --- mic/conf.py | 3 +++ mic/imager/baseimager.py | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mic/conf.py b/mic/conf.py index f99bb39..24e5d4e 100644 --- a/mic/conf.py +++ b/mic/conf.py @@ -201,6 +201,9 @@ class ConfigMgr(object): self.create['name_prefix'], self.create['name_suffix']) + if self.create['release'] is not None: + self.create['name'] = self.create['release'] + '_' + self.create['name'] + 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 269d653..f50a4e9 100644 --- a/mic/imager/baseimager.py +++ b/mic/imager/baseimager.py @@ -110,9 +110,6 @@ class BaseImageCreator(object): self.destdir = os.path.abspath(os.path.expanduser(self.destdir)) - if 'release' in createopts and createopts['release']: - self.name = createopts['release'] + '_' + self.name - if self.pack_to: if '@NAME@' in self.pack_to: self.pack_to = self.pack_to.replace('@NAME@', self.name) -- 2.7.4