PATCH don't create RPMS/ dir when splitting the tree

[Jesse Keating <jkeating redhat com>]

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.


-- 
Jesse Keating
Release Engineer: Fedora

--- ./scripts/splittree.py.jk	2007-03-07 15:46:24.000000000 -0500
+++ ./scripts/splittree.py	2007-03-07 15:56:15.000000000 -0500
@@ -204,7 +204,7 @@
                 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()

Attachment: pgpID8BAfrMsi.pgp
Description: PGP signature