From c8beac92158dfa9cdc80c7a62d981713a655dabf Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 24 Aug 2007 09:15:58 -0400 Subject: [PATCH] product_name -> name. KISS --- Changelog | 1 + pungi | 6 +++--- pypungi/pungi.py | 14 +++++++------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Changelog b/Changelog index ac5ccb50..3e094eb6 100644 --- a/Changelog +++ b/Changelog @@ -1,6 +1,7 @@ * Fri Aug 24 2007 Jesse Keating - Remove a lot of configurable items and hard set them - Move some items to cli flags only (part of moving to pykickstart) +- make "product_name" "name" instead. KISS * Thu Aug 23 2007 Jesse Keating - Add a source config for the Fedora spin diff --git a/pungi b/pungi index cfdd96d0..fbdba278 100755 --- a/pungi +++ b/pungi @@ -58,7 +58,7 @@ def main(): config.set('default', 'relnotepkgs', relnotepkgs) # set configs from cli options - config.set('default', 'product_name', opts.name) + config.set('default', 'name', opts.name) config.set('default', 'version', opts.ver) config.set('default', 'flavor', opts.flavor) config.set('default', 'destdir', opts.destdir) @@ -66,9 +66,9 @@ def main(): config.set('default', 'discs', opts.discs) # set some other defaults - config.set('default', 'product_path', config.get('default', 'product_name')) + config.set('default', 'product_path', config.get('default', 'name')) - config.set('default', 'iso_basename', config.get('default', 'product_name')) + config.set('default', 'iso_basename', config.get('default', 'name')) pkglist = get_packagelist(config.get('default', 'manifest')) diff --git a/pypungi/pungi.py b/pypungi/pungi.py index f82d0306..6f4d5881 100755 --- a/pypungi/pungi.py +++ b/pypungi/pungi.py @@ -109,7 +109,7 @@ class Pungi(pypungi.PungiBase): #buildinstall.append('TMPDIR=%s' % self.workdir) # TMPDIR broken in buildinstall buildinstall.append('--product') - buildinstall.append(self.config.get('default', 'product_name')) + buildinstall.append(self.config.get('default', 'name')) if not self.config.get('default', 'flavor') == "": buildinstall.append('--variant') @@ -119,7 +119,7 @@ class Pungi(pypungi.PungiBase): buildinstall.append(self.config.get('default', 'version')) buildinstall.append('--release') - buildinstall.append('%s %s' % (self.config.get('default', 'product_name'), self.config.get('default', 'version'))) + buildinstall.append('%s %s' % (self.config.get('default', 'name'), self.config.get('default', 'version'))) buildinstall.append('--prodpath') buildinstall.append(self.config.get('default', 'product_path')) @@ -230,7 +230,7 @@ class Pungi(pypungi.PungiBase): timber.total_discs = self.config.getint('default', 'discs') timber.bin_discs = self.config.getint('default', 'discs') timber.src_discs = 0 - timber.release_str = '%s %s' % (self.config.get('default', 'product_name'), self.config.get('default', 'version')) + timber.release_str = '%s %s' % (self.config.get('default', 'name'), self.config.get('default', 'version')) timber.package_order_file = os.path.join(self.workdir, 'pkgorder-%s' % self.config.get('default', 'arch')) timber.dist_dir = self.topdir timber.src_dir = os.path.join(self.config.get('default', 'destdir'), self.config.get('default', 'version'), 'source', 'SRPMS') @@ -257,7 +257,7 @@ class Pungi(pypungi.PungiBase): #timber.total_discs = self.config.getint('default', 'discs') #timber.bin_discs = self.config.getint('default', 'discs') timber.src_discs = self.config.getint('default', 'discs') - #timber.release_str = '%s %s' % (self.config.get('default', 'product_name'), self.config.get('default', 'version')) + #timber.release_str = '%s %s' % (self.config.get('default', 'name'), self.config.get('default', 'version')) #timber.package_order_file = os.path.join(self.config.get('default', 'destdir'), 'pkgorder-%s' % self.config.get('default', 'arch')) timber.dist_dir = os.path.join(self.config.get('default', 'destdir'), self.config.get('default', 'version'), @@ -375,7 +375,7 @@ class Pungi(pypungi.PungiBase): extraargs.extend(sparcbootargs) extraargs.append('-V') - extraargs.append('%s %s %s Disc %s' % (self.config.get('default', 'product_name'), + extraargs.append('%s %s %s Disc %s' % (self.config.get('default', 'name'), self.config.get('default', 'version'), self.config.get('default', 'arch'), disc)) extraargs.append('-o') @@ -438,7 +438,7 @@ class Pungi(pypungi.PungiBase): extraargs.extend(sparcbootargs) extraargs.append('-V') - extraargs.append('%s %s %s DVD' % (self.config.get('default', 'product_name'), + extraargs.append('%s %s %s DVD' % (self.config.get('default', 'name'), self.config.get('default', 'version'), self.config.get('default', 'arch'))) extraargs.append('-o') @@ -506,7 +506,7 @@ class Pungi(pypungi.PungiBase): extraargs.extend(sparcbootargs) extraargs.append('-V') - extraargs.append('%s %s %s Rescue' % (self.config.get('default', 'product_name'), + extraargs.append('%s %s %s Rescue' % (self.config.get('default', 'name'), self.config.get('default', 'version'), self.config.get('default', 'arch'))) extraargs.append('-o')