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

Kill extra whitespace

Browse Source
This commit is contained in:
Jesse Keating 2009-08-04 14:23:55 -07:00
parent cd466ce546
commit eb3caa4161
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/pypungi/splittree.py
View File

@ -42,45 +42,45 @@ def nvra(pkgfile):
os.close(fd) os.close(fd)
return "%s-%s-%s.%s.rpm" %(h['name'], h['version'], h['release'], return "%s-%s-%s.%s.rpm" %(h['name'], h['version'], h['release'],
h['arch']) h['arch'])
class Timber: class Timber:
"""Split trees like no other""" """Split trees like no other"""
def __init__(self): def __init__(self):
"""self.release_str : the name and version of the product" """self.release_str : the name and version of the product"
self.package_order_file : the location of the file which has self.package_order_file : the location of the file which has
the package ordering the package ordering
self.arch : the arch the tree is intended for self.arch : the arch the tree is intended for
self.real_arch : the arch found in the unified tree's self.real_arch : the arch found in the unified tree's
.discinfo file .discinfo file
self.dist_dir : the loaction of the unified tree self.dist_dir : the loaction of the unified tree
self.src_dir : the location of the unified SRPM dir self.src_dir : the location of the unified SRPM dir
self.start_time : the timestamp that's in .discinfo files self.start_time : the timestamp that's in .discinfo files
self.dir_info : The info other than start_time that goes self.dir_info : The info other than start_time that goes
into the .discinfo files. The info should already exist into the .discinfo files. The info should already exist
after running buildinstall in the unified tree after running buildinstall in the unified tree
self.total_discs : total number of discs self.total_discs : total number of discs
self.total_bin_discs : total number of discs with RPMs self.total_bin_discs : total number of discs with RPMs
self.total_srpm_discs : total number of discs with SRPMs self.total_srpm_discs : total number of discs with SRPMs
self.reverse_sort_srpms : sort the srpms in reverse order to self.reverse_sort_srpms : sort the srpms in reverse order to
fit. Usually only needed if we share a disc between SRPMs fit. Usually only needed if we share a disc between SRPMs
and RPMs. Set to 1 to turn on. and RPMs. Set to 1 to turn on.
self.reserve_size : Additional size needed to be reserved on the first disc. self.reserve_size : Additional size needed to be reserved on the first disc.
""" """
self.reserve_size = 0 self.reserve_size = 0
self.disc_size = 640.0 self.disc_size = 640.0
self.target_size = self.disc_size * 1024.0 * 1024 self.target_size = self.disc_size * 1024.0 * 1024
@ -124,7 +124,7 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
def reportSizes(self, disc, firstpkg=None, lastpkg=None): def reportSizes(self, disc, firstpkg=None, lastpkg=None):
"""appends to self.logfile""" """appends to self.logfile"""
if firstpkg: if firstpkg:
self.logfile.append("First package on disc%d: %s" % (disc, firstpkg)) self.logfile.append("First package on disc%d: %s" % (disc, firstpkg))
if lastpkg: if lastpkg:
@ -134,7 +134,7 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
self.logfile.append("%s-disc%d size: %s" % (self.arch, disc, discsize)) self.logfile.append("%s-disc%d size: %s" % (self.arch, disc, discsize))
def createDiscInfo(self, discnumber): def createDiscInfo(self, discnumber):
"""creates the .discinfo files in the split trees""" """creates the .discinfo files in the split trees"""
@ -153,7 +153,7 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
# skip the disc number line from the unified tree # skip the disc number line from the unified tree
file.readline() file.readline()
# basedir, packagedir, and pixmapdir # basedir, packagedir, and pixmapdir
self.dir_info = [file.readline()[:-1], file.readline()[:-1], file.readline()[:-1]] self.dir_info = [file.readline()[:-1], file.readline()[:-1], file.readline()[:-1]]
@ -168,8 +168,8 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
discinfo_file.write(self.dir_info[i] + '\n') discinfo_file.write(self.dir_info[i] + '\n')
discinfo_file.close() discinfo_file.close()
def linkFiles(self, src_dir, dest_dir, filelist): def linkFiles(self, src_dir, dest_dir, filelist):
"""Creates hardlinks from files in the unified dir to files in the split dirs. This is not for RPMs or SRPMs""" """Creates hardlinks from files in the unified dir to files in the split dirs. This is not for RPMs or SRPMs"""
@ -243,11 +243,11 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
def splitRPMS(self, reportSize = 1): def splitRPMS(self, reportSize = 1):
"""Creates links in the split dirs for the RPMs""" """Creates links in the split dirs for the RPMs"""
packages = {} packages = {}
pkgdir = "%s" %(self.product_path,) pkgdir = "%s" %(self.product_path,)
rpmlist = os.listdir("%s/%s" %(self.dist_dir, pkgdir)) rpmlist = os.listdir("%s/%s" %(self.dist_dir, pkgdir))
rpmlist.sort() rpmlist.sort()
@ -258,7 +258,7 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
pkg_nvr = nvra("%s/%s/%s" %(self.dist_dir, pkgdir, filename)) pkg_nvr = nvra("%s/%s/%s" %(self.dist_dir, pkgdir, filename))
except rpm.error, e: except rpm.error, e:
continue continue
if packages.has_key(pkg_nvr): if packages.has_key(pkg_nvr):
# append in case we have multiple packages with the # append in case we have multiple packages with the
# same n-v-r. Ex: the kernel has multiple n-v-r's for # same n-v-r. Ex: the kernel has multiple n-v-r's for
@ -266,9 +266,9 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
packages[pkg_nvr].append(filename) packages[pkg_nvr].append(filename)
else: else:
packages[pkg_nvr] = [filename] packages[pkg_nvr] = [filename]
orderedlist = [] orderedlist = []
# read the ordered pacakge list into orderedlist # read the ordered pacakge list into orderedlist
file = open(self.package_order_file, 'r') file = open(self.package_order_file, 'r')
for pkg_nvr in file.readlines(): for pkg_nvr in file.readlines():
@ -280,7 +280,7 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
# last package is the last package placed on the disc # last package is the last package placed on the disc
firstpackage = '' firstpackage = ''
lastpackage = '' lastpackage = ''
# packagenum resets when we change discs. It's used to # packagenum resets when we change discs. It's used to
# determine the first package in the split tree and that's # determine the first package in the split tree and that's
# about it # about it
@ -305,7 +305,7 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
maxsize = self.target_size - self.comps_size - self.reserve_size maxsize = self.target_size - self.comps_size - self.reserve_size
else: else:
maxsize = self.target_size maxsize = self.target_size
packagenum = packagenum + 1 packagenum = packagenum + 1
if packagenum == 1: if packagenum == 1:
@ -379,7 +379,7 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
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(self.src_list)): for i in range(0, len(self.src_list)):
self.reportSizes(self.src_list[i]) self.reportSizes(self.src_list[i])
@ -403,10 +403,10 @@ def usage(theerror):
print """Usage: %s --arch=i386 --total-discs=8 --bin-discs=4 --src-discs=4 --release-string="distro name" --pkgorderfile=/tmp/pkgorder.12345 --distdir=/usr/src/someunifiedtree --srcdir=/usr/src/someunifiedtree/SRPMS --productpath=product""" % sys.argv[0] print """Usage: %s --arch=i386 --total-discs=8 --bin-discs=4 --src-discs=4 --release-string="distro name" --pkgorderfile=/tmp/pkgorder.12345 --distdir=/usr/src/someunifiedtree --srcdir=/usr/src/someunifiedtree/SRPMS --productpath=product""" % sys.argv[0]
sys.exit(1) sys.exit(1)
if "__main__" == __name__: if "__main__" == __name__:
import getopt import getopt
timber = Timber() timber = Timber()
theargs = ["arch=", "total-discs=", "bin-discs=", 'disc-size=', theargs = ["arch=", "total-discs=", "bin-discs=", 'disc-size=',
@ -463,7 +463,7 @@ if "__main__" == __name__:
timber.src_dir = options["--srcdir"] timber.src_dir = options["--srcdir"]
else: else:
usage("You forgot to specify --srcdir") usage("You forgot to specify --srcdir")
if options.has_key("--productpath"): if options.has_key("--productpath"):
timber.product_path = options["--productpath"] timber.product_path = options["--productpath"]
@ -474,7 +474,7 @@ if "__main__" == __name__:
timber.disc_size = float(options["--disc-size"]) timber.disc_size = float(options["--disc-size"])
logfile = timber.main() logfile = timber.main()
for logentry in range(0, len(logfile)): for logentry in range(0, len(logfile)):
print logfile[logentry] print logfile[logentry]