extras-buildsys/utils/pushscript Push.py, 1.26, 1.27 RepoPrune.py, 1.1, 1.2 WhatsNew.py, 1.1, 1.2

[Ville Skytta (scop)]

Author: scop

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4163

Modified Files:
	Push.py RepoPrune.py WhatsNew.py 
Log Message:
Support nosrc.rpms.


Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Push.py	21 Dec 2006 23:46:06 -0000	1.26
+++ Push.py	1 Jan 2007 16:00:46 -0000	1.27
@@ -206,6 +206,7 @@
         # There can be only one src.rpm in this dir, since relroot
         # and src.rpm filename are unique (due to NVR).
         srcrpms = find_files(relroot,'*.src.rpm')
+        srcrpms.extend(find_files(relroot,'*.nosrc.rpm'))
         # Currently, directories can be empty though, unless we clean up
         # the repodir regularly.
         if not len(srcrpms):
@@ -215,6 +216,7 @@
         # Now compare with the other releases.
         for nextrelroot in pkgrelroots[1:]:
             nextsrcrpms = find_files(nextrelroot,'*.src.rpm')
+            nextsrcrpms.extend(find_files(nextrelroot,'*.nosrc.rpm'))
             if not len(nextsrcrpms):
                 continue
             nextsrcrpm = nextsrcrpms[0]
@@ -326,7 +328,7 @@
         if file.endswith('.rpm'):
             if file.find('debuginfo') != -1:
                 which = 'debuginfo' 
-            elif file.endswith('.src.rpm'):
+            elif file.endswith('.src.rpm') or file.endswith('.nosrc.rpm'):
                 which = 'srpm'
             else:
                 which = 'rpm'


Index: RepoPrune.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/RepoPrune.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RepoPrune.py	23 Oct 2006 11:24:35 -0000	1.1
+++ RepoPrune.py	1 Jan 2007 16:00:46 -0000	1.2
@@ -35,6 +35,8 @@
     for root, dirs, files in os.walk(srcdir):
             for f in fnmatch.filter(files,'*.src.rpm'):
                 srcfiles.append(os.path.join(root,f))
+            for f in fnmatch.filter(files,'*.nosrc.rpm'):
+                srcfiles.append(os.path.join(root,f))
     if not len(srcfiles):
         print '  Nothing found.'
         return changed


Index: WhatsNew.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/WhatsNew.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WhatsNew.py	30 Nov 2006 10:53:55 -0000	1.1
+++ WhatsNew.py	1 Jan 2007 16:00:46 -0000	1.2
@@ -31,7 +31,10 @@
     names.setdefault(dist,{})
    
     for root, dirs, files in os.walk(srcdir):
-            for f in fnmatch.filter(files,'*.src.rpm'):
+            srpms = []
+            srpms.extend(fnmatch.filter(files,'*.src.rpm'))
+            srpms.extend(fnmatch.filter(files,'*.nosrc.rpm'))
+            for f in srpms:
                 srcfile = os.path.join(root,f)
                 hdr = rpmUtils.miscutils.hdrFromPackage(ts,srcfile)
                 set(dist,hdr['name'])