revisor/pungi.py | 2 +-
revisor/splittree.py | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit f496eb010a8dee5c3fbac1f6f55e55597fb8e509
Author: Jeroen van Meeuwen (Fedora Unity) <kana...@fedoraunity.org>
Date: Thu Mar 5 17:45:08 2009 +0100
Revert some of the changes related to estimating the size of the trees
going to one or more discs
diff --git a/revisor/pungi.py b/revisor/pungi.py
index e79fba3..82fe9f0 100644
--- a/revisor/pungi.py
+++ b/revisor/pungi.py
@@ -454,7 +454,7 @@ cost=500
for disc in range(1, timber.total_discs + 1):
if not we_are_ok: continue
- disc_size = timber.getIsoSize("%s-disc%d" % (timber.dist_dir,
disc))
+ disc_size = timber.getSize("%s-disc%d" % (timber.dist_dir,
disc))
if disc_size > timber.target_size:
self.log.debug(_("Disc %s #%d is oversized (%r > %r)") %
(self.cfg.mediatypes[discdir]["label"], disc, disc_size, timber.target_size),
level=9)
diff --git a/revisor/splittree.py b/revisor/splittree.py
index a2105b2..307820e 100755
--- a/revisor/splittree.py
+++ b/revisor/splittree.py
@@ -110,7 +110,7 @@ self.reserve_size : Additional size needed to be reserved
on the first disc.
if lastpkg:
self.logfile.append("Last package on disc%d : %s" % (disc,
lastpkg))
- discsize = self.getIsoSize("%s-disc%d" % (self.dist_dir, disc))
+ discsize = self.getSize("%s-disc%d" % (self.dist_dir, disc))
self.logfile.append("%s-disc%d size: %s" % (self.arch, disc, discsize))
def createDiscInfo(self, discnumber):
@@ -245,7 +245,7 @@ self.reserve_size : Additional size needed to be reserved
on the first disc.
self.log.debug(_("pkg %s already included, skipping") % pkg,
level=9)
continue
- curused = self.getIsoSize("%s-disc%s" % (self.dist_dir, disc))
+ curused = self.getSize("%s-disc%s" % (self.dist_dir, disc))
filesize = os.stat("%s/%s/%s" % (self.dist_dir, pkgdir,
pkg)).st_size
newsize = filesize + curused
@@ -298,7 +298,7 @@ self.reserve_size : Additional size needed to be reserved
on the first disc.
sizes = []
for i in range(0, len(self.src_list)):
- sizes.append([self.getIsoSize("%s-disc%d" % (self.dist_dir,
self.src_list[i])), self.src_list[i]])
+ sizes.append([self.getSize("%s-disc%d" % (self.dist_dir,
self.src_list[i])), self.src_list[i]])
sizes.sort()
return sizes[0]
@@ -325,12 +325,12 @@ self.reserve_size : Additional size needed to be reserved
on the first disc.
# if it isn't, pull it out of the list. If there's only
# one disk make loud noises over the overflow
for disc in self.src_list:
- if self.getIsoSize("%s-disc%s" % (self.dist_dir, disc)) >
self.target_size:
+ if self.getSize("%s-disc%s" % (self.dist_dir, disc)) >
self.target_size:
if len(self.src_list) < 2:
self.logfile.append("Overflowing %s on disc%d" %
(srpm_list[i][1], disc))
break
else:
- discsize = self.getIsoSize("%s-disc%d" %
(self.dist_dir, disc))
+ discsize = self.getSize("%s-disc%d" % (self.dist_dir,
disc))
self.logfile.append("%s-disc%d size: %s" % (self.arch,
disc, discsize))
self.src_list.pop(self.src_list.index(disc))
os.link("%s/%s" % (self.src_dir, srpm_list[i][1]),
_______________________________________________
revisor-devel mailing list
revisor-devel@lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/revisor-devel
