From 1e9d5392e6f4eff08bf35f68f471bad9468b79cb Mon Sep 17 00:00:00 2001 From: "jkeating@reducto.boston.redhat.com" <> Date: Fri, 16 Feb 2007 13:59:01 -0500 Subject: [PATCH] Make cdsize a config option --- Changelog | 1 + pungi | 4 ++++ pypungi/pungi.py | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index 8098ad63..0fd81e4c 100644 --- a/Changelog +++ b/Changelog @@ -2,6 +2,7 @@ - Make use of anaconda's TMPDIR support - Put yum tempdirs in the workdir - Add a version option to cli arguments +- Make cdsize a config option * Thu Feb 15 2007 Jesse Keating - Various logging tweaks diff --git a/pungi b/pungi index 9f57a745..b32638fe 100755 --- a/pungi +++ b/pungi @@ -28,6 +28,7 @@ def main(): sourcedir = "source" debugdir = "debug" isodir = "iso" + cdsize = "685.0" relnotefilere = "eula.txt fedora.css GPL README-BURNING-ISOS-en_US.txt RELEASE-NOTES-en_US.html ^RPM-GPG" relnotedirre = "images stylesheet-images" relnotepkgs = "fedora-release fedora-release-notes" @@ -52,6 +53,9 @@ def main(): if not config.has_option('default', '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'): config.set('default', 'relnotefilere', relnotefilere) diff --git a/pypungi/pungi.py b/pypungi/pungi.py index de5a6a97..54db2339 100755 --- a/pypungi/pungi.py +++ b/pypungi/pungi.py @@ -145,7 +145,7 @@ class Pungi: timber = splittree.Timber() 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.bin_discs = self.config.getint('default', 'discs') timber.src_discs = 0