extras-repoclosure rc-report.py,1.56,1.57

[Michael Schwendt]

Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3272

Modified Files:
	rc-report.py 
Log Message:
the newer Yum pkgids in E:N-V-R.arch format with optional "E:" prefix broke the whitelist and kmod broken deps reappeared -- made it use just N


Index: rc-report.py
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/rc-report.py,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- rc-report.py	24 Oct 2008 21:52:20 -0000	1.56
+++ rc-report.py	25 Oct 2008 15:53:29 -0000	1.57
@@ -5,6 +5,7 @@
 import re
 import smtplib
 import datetime, time
+import rpmUtils.miscutils
 from optparse import OptionParser
 import ConfigParser
 
@@ -31,8 +32,9 @@
 
 class BrokenDep:
     def __init__(self):
-        self.pkgid = None  # 'name-EVR.arch'
+        self.pkgid = None  # 'E:name-VR.arch' (previously: 'name-EVR.arch')
         self.repoid = None  # e.g. 'fedora-core-6-i386'
+        self.name = None  # just the binary rpm %{name}
         self.srpm_name = None
         self.owner = ''
         self.coowners = []
@@ -52,11 +54,11 @@
 
 def whiteListed(b): # Just a hook, not a generic white-list feature.
     # These two in Fedora 7 Everything most likely won't be fixed.
-    if b.pkgid.startswith('kmod-em8300') and b.repoid.startswith('fedora-7'):
+    if b.name.startswith('kmod-em8300') and b.repoid.startswith('fedora-7'):
         return True
-    elif b.pkgid.startswith('kmod-sysprof') and b.repoid.startswith('fedora-7'):
+    elif b.name.startswith('kmod-sysprof') and b.repoid.startswith('fedora-7'):
         return True
-    elif b.pkgid.startswith('kmod'):  # gah ;)  temporarily catch them all
+    elif b.name.startswith('kmod'):  # gah ;)  temporarily catch them all
         return True
     else:
         return False
@@ -237,8 +239,10 @@
                 b.pkgid = b.pkgid.replace(' ','')
             else:
                 b.repoid = w[3]
-                b.pkgid = w[1] # name-EVR.arch
+                b.pkgid = w[1]  # E:name-VR.arch
             b.srpm_name = srpm_name
+            # Extract pkg name from pkgid.
+            b.name = rpmUtils.miscutils.splitFilename(b.pkgid)[0]
             brokendeps.append(b)
 
         if inbody: