Sophie

Sophie

distrib > Scientific%20Linux > 5x > x86_64 > by-pkgid > a16f3d3d398740fdc0a4dc7e3b234338 > files > 3

anaconda-11.1.2.168-1.SL.src.rpm

diff -uNr anaconda-11.1.2.36__orig/scripts/splittree.py anaconda-11.1.2.36/scripts/splittree.py
--- anaconda-11.1.2.36__orig/scripts/splittree.py	2006-07-21 18:59:07.000000000 +0000
+++ anaconda-11.1.2.36/scripts/splittree.py	2007-03-28 21:29:30.000000000 +0000
@@ -199,7 +199,7 @@
 
         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)
@@ -228,10 +228,10 @@
                         pass
 
                 # now create the product/RPMS dir
-                os.makedirs("%s-disc%d/%s/RPMS" % (self.dist_dir, i, self.product_path))
+                #os.makedirs("%s-disc%d/%s" % (self.dist_dir, i, self.product_path))
                 
             else:
-                os.makedirs("%s-disc%d/%s/RPMS" % (self.dist_dir, i, self.product_path))
+                os.makedirs("%s-disc%d/%s" % (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 +250,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()