almalinux
/
pungi
15
1
Fork 0
Code Issues Pull Requests Releases Activity

product_name -> name. KISS

This commit is contained in:
Jesse Keating 2007-08-24 09:15:58 -04:00 committed by Jesse Keating
parent 54d3d6b809
commit c8beac9215
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog
View File

@ -1,6 +1,7 @@
* Fri Aug 24 2007 Jesse Keating <jkeating@redhat.com>
- 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 <jkeating@redhat.com>
- Add a source config for the Fedora spin

6
pungi
View File

@ -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'))

14
pypungi/pungi.py
View File

@ -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')