| 1 |
slords |
1.1 |
diff -uNr anaconda-11.1.2.36__orig/scripts/splittree.py anaconda-11.1.2.36/scripts/splittree.py |
| 2 |
|
|
--- anaconda-11.1.2.36__orig/scripts/splittree.py 2006-07-21 18:59:07.000000000 +0000 |
| 3 |
|
|
+++ anaconda-11.1.2.36/scripts/splittree.py 2007-03-28 21:29:30.000000000 +0000 |
| 4 |
|
|
@@ -199,7 +199,7 @@ |
| 5 |
|
|
|
| 6 |
|
|
for i in range(self.bin_list[0], self.bin_list[-1] + 1): |
| 7 |
|
|
if i == 1: |
| 8 |
|
|
- p = os.popen('find %s/ -type f -not -name .discinfo' % self.dist_dir, 'r') |
| 9 |
|
|
+ p = os.popen('find %s/ -type f -not -name .discinfo -not -name *.rpm' % self.dist_dir, 'r') |
| 10 |
|
|
filelist = p.read() |
| 11 |
|
|
p.close() |
| 12 |
|
|
filelist = string.split(filelist) |
| 13 |
|
|
@@ -228,10 +228,10 @@ |
| 14 |
|
|
pass |
| 15 |
|
|
|
| 16 |
|
|
# now create the product/RPMS dir |
| 17 |
|
|
- os.makedirs("%s-disc%d/%s/RPMS" % (self.dist_dir, i, self.product_path)) |
| 18 |
|
|
+ #os.makedirs("%s-disc%d/%s" % (self.dist_dir, i, self.product_path)) |
| 19 |
|
|
|
| 20 |
|
|
else: |
| 21 |
|
|
- os.makedirs("%s-disc%d/%s/RPMS" % (self.dist_dir, i, self.product_path)) |
| 22 |
|
|
+ os.makedirs("%s-disc%d/%s" % (self.dist_dir, i, self.product_path)) |
| 23 |
|
|
self.linkFiles(self.dist_dir, "%s-disc%d" %(self.dist_dir, i), self.common_files) |
| 24 |
|
|
self.createDiscInfo(i) |
| 25 |
|
|
|
| 26 |
|
|
@@ -250,10 +250,7 @@ |
| 27 |
|
|
|
| 28 |
|
|
packages = {} |
| 29 |
|
|
|
| 30 |
|
|
- if os.path.isdir("%s/%s/RPMS" %(self.dist_dir, self.product_path)): |
| 31 |
|
|
- pkgdir = "%s/RPMS" %(self.product_path, ) |
| 32 |
|
|
- else: |
| 33 |
|
|
- pkgdir = "%s" %(self.product_path,) |
| 34 |
|
|
+ pkgdir = "%s" %(self.product_path,) |
| 35 |
|
|
|
| 36 |
|
|
rpmlist = os.listdir("%s/%s" %(self.dist_dir, pkgdir)) |
| 37 |
|
|
rpmlist.sort() |
Parent Directory
| 
Revision Log
| 
Revision Graph
