diff options
author | Gui Chen <gui.chen@intel.com> | 2014-05-14 01:57:26 -0400 |
---|---|---|
committer | admin <yuhuan.yang@samsung.com> | 2016-02-04 18:08:23 +0800 |
commit | ec9d293440b9769a195e2193e98cd28bb41408f2 (patch) | |
tree | ed7f093e8fe5336a00a2eccf274560983a2a6aed | |
parent | ca5cb765d0d3fb61f0722e996b44cf9a38863419 (diff) | |
download | mic-ec9d293440b9769a195e2193e98cd28bb41408f2.tar.gz mic-ec9d293440b9769a195e2193e98cd28bb41408f2.tar.bz2 mic-ec9d293440b9769a195e2193e98cd28bb41408f2.zip |
relocate create.name to conf module
Change-Id: Id3e8d2cbf0a4e08ecfbe7941c4967206cd40cd88
Signed-off-by: Gui Chen <gui.chen@intel.com>
-rw-r--r-- | mic/conf.py | 3 | ||||
-rw-r--r-- | 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) |