upgradecheck upgradecheck.py,1.6,1.7

[Ville Skytta (scop)]

Author: scop

Update of /cvs/fedora/upgradecheck
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21510

Modified Files:
	upgradecheck.py 
Log Message:
Operate still on SRPMs, but make it somewhat less hardcoded.


Index: upgradecheck.py
===================================================================
RCS file: /cvs/fedora/upgradecheck/upgradecheck.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- upgradecheck.py	18 Jun 2006 10:00:37 -0000	1.6
+++ upgradecheck.py	18 Jun 2006 10:04:15 -0000	1.7
@@ -26,6 +26,7 @@
 from email.MIMEText import MIMEText
 import datetime
 import re
+import rpmUtils.arch
 
 mail_from = "buildsys at fedoraproject.org"
 mail_to = "fedora-extras-list at redhat.com"
@@ -38,6 +39,7 @@
 # associated with distro "9".
 
 dists = ('3', '4', '5', '6')
+archs = rpmUtils.arch.getArchList('src')
 
 def parseArgs():
     usage = "usage: %s [-n] [-c <config file>] [-a <arch>] [-r <repoid>] [-r <repoid2>]" % sys.argv[0]
@@ -67,7 +69,7 @@
     
     def readMetadata(self):
         self.doRepoSetup()
-        self.doSackSetup(("src", ))
+        self.doSackSetup(archs)
         for repo in self.repos.listEnabled():
             self.repos.populateSack(which=[repo.id])
     
@@ -124,14 +126,13 @@
 
     allnames = {} # Python < 2.4 compat, otherwise we'd use sorted(set(...))
     for dist in enabled_dists:
-        for pkg in solvers[dist].pkgSack.returnNewestByNameArch():
-            if pkg.arch != "src":
-                pass
-            allnames[pkg.name] = 1
-            pkgdict[dist][pkg.name] = {
-                "evr": (pkg.epoch, pkg.version, pkg.release),
-                "repo": pkg.repoid,
-                }
+        for l in solvers[dist].pkgSack.returnNewestByName():
+            for pkg in l:
+                allnames[pkg.name] = 1
+                pkgdict[dist][pkg.name] = {
+                    "evr": (pkg.epoch, pkg.version, pkg.release),
+                    "repo": pkg.repoid,
+                    }
     allnames = allnames.keys()
     allnames.sort(lambda x, y: cmp(x.lower(), y.lower()))