extras-buildsys/utils/pushscript MultiLib.py,1.27,1.28

[Michael Schwendt]

Author: mschwendt

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

Modified Files:
	MultiLib.py 
Log Message:
Don't multilib debuginfo rpms (not done in base Fedora either).


Index: MultiLib.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/MultiLib.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- MultiLib.py	27 Mar 2009 16:58:00 -0000	1.27
+++ MultiLib.py	18 Apr 2009 08:43:25 -0000	1.28
@@ -142,9 +142,10 @@
             missingdict[targetarch]['rpms'] = pkglist
 #            print ' +', pkgbasefn
         pkglist = missingdict[targetarch].setdefault('debug',[])
-        if debugrpm not in pkglist:
-            pkglist.append(debugrpm)
-            missingdict[targetarch]['debug'] = pkglist
+# Don't multilib debuginfo rpms (not done in base Fedora either).
+#        if debugrpm not in pkglist:
+#            pkglist.append(debugrpm)
+#            missingdict[targetarch]['debug'] = pkglist
         
     return
 
@@ -213,13 +214,14 @@
             self.needed[pkg.repoid]['rpms'].append(file)
             print ' +', file
 
-            binarch = a
-            srcrpm = pkg.returnSimple('sourcerpm')
-            (n,v,r,e,a) = rpmUtils.miscutils.splitFilename(srcrpm)
-            debugrpm = '%s-debuginfo-%s-%s.%s.rpm' % (n,v,r,binarch)
-            if debugrpm not in self.needed[pkg.repoid]['debug']:
-                self.needed[pkg.repoid]['debug'].append(debugrpm)
-                print ' +', debugrpm
+# Don't multilib debuginfo rpms (not done in base Fedora either).
+#            binarch = a
+#            srcrpm = pkg.returnSimple('sourcerpm')
+#            (n,v,r,e,a) = rpmUtils.miscutils.splitFilename(srcrpm)
+#            debugrpm = '%s-debuginfo-%s-%s.%s.rpm' % (n,v,r,binarch)
+#            if debugrpm not in self.needed[pkg.repoid]['debug']:
+#                self.needed[pkg.repoid]['debug'].append(debugrpm)
+#                print ' +', debugrpm
 
     def resolveRequires(self,pkg):
         if pkg.__str__() in self.seenbefore: