extras-buildsys/utils/pushscript WhatsNew.py,1.14,1.15

Michael Schwendt mschwendt at fedoraproject.org
Fri Aug 7 20:25:37 UTC 2009


Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2501

Modified Files:
	WhatsNew.py 
Log Message:
Don't query %arch when pruning old src.rpms, since %arch in src.rpms is the arch the package was built on


Index: WhatsNew.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/WhatsNew.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- WhatsNew.py	1 Aug 2009 17:35:51 -0000	1.14
+++ WhatsNew.py	7 Aug 2009 20:25:36 -0000	1.15
@@ -46,18 +46,17 @@
             v = hdr['version']
             r = hdr['release']
             e = hdr['epoch']
-            a = hdr['arch']
             if e is None:
                 e = 0
-            newestrpms.setdefault("%s.%s" % (n,a),[])
-            newestrpms["%s.%s" % (n,a)].append((f,n,e,v,r,a))
+            newestrpms.setdefault(n,[])
+            newestrpms[n].append((f,n,e,v,r))
 
     for l in newestrpms.values():
         x = len(l)
         if x > 1:
             def sortByEVR(fnevr1, fnevr2):
-                (f1,n1,e1,v1,r1,a1) = fnevr1
-                (f2,n2,e2,v2,r2,a2) = fnevr2
+                (f1,n1,e1,v1,r1) = fnevr1
+                (f2,n2,e2,v2,r2) = fnevr2
                 rc = rpmUtils.miscutils.compareEVR((e1,v1,r1),(e2,v2,r2))
                 if rc == 0:
                     return 0
@@ -70,7 +69,7 @@
         oldies = []
         if len(l) > 1:
             oldies = l[1:]
-        for (f,n,e,v,r,a) in oldies:
+        for (f,n,e,v,r) in oldies:
             #print '  Ignoring', os.path.basename(f)
             rpmfiles.remove(f)
 




More information about the fedora-extras-commits mailing list