Use disc_size in splittree as splittree.main() will reset target_size based on it.

Set comps size to 0 as we don't create a comps package anymore.

Longer term we need to stop calling main() from splittree, and instead just
call the functions we need manually.  A bit late for that change for the F10
cycle though.
This commit is contained in:
Jesse Keating 2008-11-04 14:48:27 -08:00
parent 4d01eb4785
commit 3c30592dab

View File

@ -824,7 +824,7 @@ class Pungi(pypungi.PungiBase):
timber = splittree.Timber()
timber.arch = self.config.get('default', 'arch')
timber.target_size = self.config.getfloat('default', 'cdsize') * 1024 * 1024
timber.disc_size = self.config.getfloat('default', 'cdsize')
timber.total_discs = self.config.getint('default', 'discs')
timber.bin_discs = self.config.getint('default', 'discs')
timber.src_discs = 0
@ -834,6 +834,7 @@ class Pungi(pypungi.PungiBase):
timber.src_dir = os.path.join(self.config.get('default', 'destdir'), self.config.get('default', 'version'), 'source', 'SRPMS')
timber.product_path = self.config.get('default', 'product_path')
timber.common_files = self.common_files
timber.comps_size = 0
#timber.reserve_size =
self.logger.info("Running splittree.")