Make cdsize a config option

This commit is contained in:
jkeating@reducto.boston.redhat.com 2007-02-16 13:59:01 -05:00 committed by Jesse Keating
parent 8ceceaf811
commit 1e9d5392e6
3 changed files with 6 additions and 1 deletions

View File

@ -2,6 +2,7 @@
- Make use of anaconda's TMPDIR support - Make use of anaconda's TMPDIR support
- Put yum tempdirs in the workdir - Put yum tempdirs in the workdir
- Add a version option to cli arguments - Add a version option to cli arguments
- Make cdsize a config option
* Thu Feb 15 2007 Jesse Keating <jkeating@redhat.com> * Thu Feb 15 2007 Jesse Keating <jkeating@redhat.com>
- Various logging tweaks - Various logging tweaks

4
pungi
View File

@ -28,6 +28,7 @@ def main():
sourcedir = "source" sourcedir = "source"
debugdir = "debug" debugdir = "debug"
isodir = "iso" isodir = "iso"
cdsize = "685.0"
relnotefilere = "eula.txt fedora.css GPL README-BURNING-ISOS-en_US.txt RELEASE-NOTES-en_US.html ^RPM-GPG" relnotefilere = "eula.txt fedora.css GPL README-BURNING-ISOS-en_US.txt RELEASE-NOTES-en_US.html ^RPM-GPG"
relnotedirre = "images stylesheet-images" relnotedirre = "images stylesheet-images"
relnotepkgs = "fedora-release fedora-release-notes" relnotepkgs = "fedora-release fedora-release-notes"
@ -52,6 +53,9 @@ def main():
if not config.has_option('default', 'isodir'): if not config.has_option('default', 'isodir'):
config.set('default', 'isodir', isodir) config.set('default', 'isodir', isodir)
if not config.has_option('default', 'cdsize'):
config.set('default', 'cdsize', cdsize)
if not config.has_option('default', 'relnotefilere'): if not config.has_option('default', 'relnotefilere'):
config.set('default', 'relnotefilere', relnotefilere) config.set('default', 'relnotefilere', relnotefilere)

View File

@ -145,7 +145,7 @@ class Pungi:
timber = splittree.Timber() timber = splittree.Timber()
timber.arch = self.config.get('default', 'arch') timber.arch = self.config.get('default', 'arch')
timber.target_size = 685.0 * 1024.0 * 1024 # make this a config option timber.target_size = float(self.config.get('default', 'cdsize')) * 1024 * 1024
timber.total_discs = self.config.getint('default', 'discs') timber.total_discs = self.config.getint('default', 'discs')
timber.bin_discs = self.config.getint('default', 'discs') timber.bin_discs = self.config.getint('default', 'discs')
timber.src_discs = 0 timber.src_discs = 0