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

Use the new splittree method of dynamic srpm cd splitting

Browse Source
This commit is contained in:
Jesse Keating 2009-05-18 14:35:52 -07:00
parent a73e976bc8
commit 8a15ecca80
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/pypungi/__init__.py
View File

@ -952,7 +952,6 @@ class Pungi(pypungi.PungiBase):
timber.target_size = self.config.getfloat('pungi', 'cdsize') * 1024 * 1024 timber.target_size = self.config.getfloat('pungi', 'cdsize') * 1024 * 1024
#timber.total_discs = self.config.getint('pungi', 'discs') #timber.total_discs = self.config.getint('pungi', 'discs')
#timber.bin_discs = self.config.getint('pungi', 'discs') #timber.bin_discs = self.config.getint('pungi', 'discs')
timber.src_discs = self.config.getint('pungi', 'discs')
#timber.release_str = '%s %s' % (self.config.get('pungi', 'name'), self.config.get('pungi', 'version')) #timber.release_str = '%s %s' % (self.config.get('pungi', 'name'), self.config.get('pungi', 'version'))
#timber.package_order_file = os.path.join(self.config.get('pungi', 'destdir'), 'pkgorder-%s' % self.config.get('pungi', 'arch')) #timber.package_order_file = os.path.join(self.config.get('pungi', 'destdir'), 'pkgorder-%s' % self.config.get('pungi', 'arch'))
timber.dist_dir = os.path.join(self.config.get('pungi', 'destdir'), timber.dist_dir = os.path.join(self.config.get('pungi', 'destdir'),
@ -965,18 +964,6 @@ class Pungi(pypungi.PungiBase):
'source', 'SRPMS') 'source', 'SRPMS')
#timber.product_path = self.config.get('pungi', 'product_path') #timber.product_path = self.config.get('pungi', 'product_path')
#timber.reserve_size = #timber.reserve_size =
# Set this ourselves, for creating our dirs ourselves
timber.src_list = range(1, timber.src_discs + 1)
# this is stolen from splittree.py in anaconda-runtime. Blame them if its ugly (:
for i in range(timber.src_list[0], timber.src_list[-1] + 1):
pypungi.util._ensuredir('%s-disc%d/SRPMS' % (timber.dist_dir, i),
self.logger,
force=self.config.getboolean('pungi', 'force'),
clean=True)
timber.linkFiles(timber.dist_dir,
"%s-disc%d" %(timber.dist_dir, i),
timber.common_files)
self.logger.info("Splitting SRPMs") self.logger.info("Splitting SRPMs")
timber.splitSRPMS() timber.splitSRPMS()
@ -1169,6 +1156,12 @@ cost=500
discs = 0 discs = 0
if self.config.get('pungi', 'arch') == 'source': if self.config.get('pungi', 'arch') == 'source':
self.doSplitSRPMs() self.doSplitSRPMs()
dirs = os.listdir(self.archdir)
for dir in dirs:
if dir.startswith('%s-disc' % os.path.basename(self.topdir)):
discs += 1
# Set the number of discs for future use
self.config.set('pungi', 'discs', str(discs))
else: else:
self.doPackageorder() self.doPackageorder()
self.doSplittree() self.doSplittree()

6
src/pypungi/splittree.py
View File

@ -443,15 +443,15 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
# We couldn't find a disc to fit on, make a new one # We couldn't find a disc to fit on, make a new one
self.src_list.append(self.src_list[-1] + 1) self.src_list.append(self.src_list[-1] + 1)
self.createSRPMSplitDir() self.createSRPMSplitDir()
fit = src_list[-1] fit = self.src_list[-1]
# now link the srpm to the disc we found (or created) that had room # now link the srpm to the disc we found (or created) that had room
os.link("%s/%s" % (self.src_dir, srpm_list[i][1]), os.link("%s/%s" % (self.src_dir, srpm_list[i][1]),
"%s-disc%d/SRPMS/%s" % (self.dist_dir, fit, srpm_list[i][1])) "%s-disc%d/SRPMS/%s" % (self.dist_dir, fit, srpm_list[i][1]))
src_dict[fit] = src_dict.setdefault(fit, 0) + srpmsize src_dict[fit] = src_dict.setdefault(fit, 0) + srpmsize
for i in range(0, len(src_list)): for i in range(0, len(self.src_list)):
self.reportSizes(src_list[i]) self.reportSizes(self.src_list[i])
def main(self): def main(self):