Jesse Keating wrote:
This patch does what the subjet says, and removes other things that would look
for a RPMS dir. I tested this with pungi, seems to work as expected.
I've been using something identical! but with one more added patch-bit,
that is to prevent splittree from linking over the entire
BaseDir/Product/*.rpms over into -disc1/Product/
my version of the same patch with that extra bit added, attached here.
- KB
--
Karanbir Singh : http://www.karan.org/ : 2522219@icq
diff -uNr anaconda-11.1.2.16__orig/scripts/splittree.py anaconda-11.1.2.16/scripts/splittree.py
--- anaconda-11.1.2.16__orig/scripts/splittree.py 2006-07-21 19:59:07.000000000 +0100
+++ anaconda-11.1.2.16/scripts/splittree.py 2007-02-08 02:09:11.000000000 +0000
@@ -199,12 +199,12 @@
for i in range(self.bin_list[0], self.bin_list[-1] + 1):
if i == 1:
- p = os.popen('find %s/ -type f -not -name .discinfo' % self.dist_dir, 'r')
+ p = os.popen('find %s/ -type f -not -name .discinfo -not -name *.rpm' % self.dist_dir, 'r')
filelist = p.read()
p.close()
filelist = string.split(filelist)
- p = os.popen('find %s/ -type d -not -name RPMS -not -name SRPMS' % self.dist_dir, 'r')
+ p = os.popen('find %s/ -type d -not -name SRPMS' % self.dist_dir, 'r')
dirlist = p.read()
p.close()
dirlist = string.split(dirlist)
@@ -227,11 +227,7 @@
except OSError, (errno, msg):
pass
- # now create the product/RPMS dir
- os.makedirs("%s-disc%d/%s/RPMS" % (self.dist_dir, i, self.product_path))
-
else:
- os.makedirs("%s-disc%d/%s/RPMS" % (self.dist_dir, i, self.product_path))
self.linkFiles(self.dist_dir, "%s-disc%d" %(self.dist_dir, i), self.common_files)
self.createDiscInfo(i)
@@ -250,10 +246,7 @@
packages = {}
- if os.path.isdir("%s/%s/RPMS" %(self.dist_dir, self.product_path)):
- pkgdir = "%s/RPMS" %(self.product_path, )
- else:
- pkgdir = "%s" %(self.product_path,)
+ pkgdir = "%s" %(self.product_path,)
rpmlist = os.listdir("%s/%s" %(self.dist_dir, pkgdir))
rpmlist.sort()
