extras-buildsys/utils/pushscript MultiLib.py,1.18,1.19

[Michael Schwendt]

Author: mschwendt

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

Modified Files:
	MultiLib.py 
Log Message:
cmp yum.__version__ as previous commit was bad


Index: MultiLib.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/MultiLib.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- MultiLib.py	12 Nov 2008 16:13:23 -0000	1.18
+++ MultiLib.py	12 Nov 2008 17:09:35 -0000	1.19
@@ -22,10 +22,9 @@
 import Utils, RepoSupport
 
 import yum, yum.Errors
-# This function is not available in Yum 2.?.x
-yumver = tuple([ int(num) for num in yum.__version__.split('.')])
+yumver = yum.__version__
 from yum.packages import YumLocalPackage
-if yumver[0]<=2 and yumver[1]<9:  # yum < 2.9
+if cmp(yumver,'2.9')<0:  # yum < 2.9
     from repomd.packageSack import ListPackageSack
 else:
     from yum.packageSack import ListPackageSack
@@ -81,10 +80,10 @@
 
         pkg = YumLocalPackage(ts=ts,filename=fname)
         srcrpm = pkg.tagByName('sourcerpm')
-        if yumver[0]>=3 and yumver[1]>=2 and len(yumver)>=3 and yumver[2]>=17:  # yum > 3.2.17
-            (n,a,e,v,r) = pkg.pkgtup
-        else:
+        if cmp(yumver,'2.9.6')<0:  # < 2.9.6
             (n,a,e,v,r) = pkg.returnPackageTuple()
+        else:
+            (n,a,e,v,r) = pkg.pkgtup
         (sn,sv,sr,se,sa) = rpmUtils.miscutils.splitFilename(srcrpm)
         debugrpm = '%s-debuginfo-%s-%s.%s.rpm' % (sn,sv,sr,a)
 
@@ -183,7 +182,7 @@
         self.doRepoSetup()
         self.doSackSetup( self.arch )
         for repo in self.repos.listEnabled():
-            if yumver[0]>=3 and yumver[1]>=1 and len(yumver)>=3 and yumver[2]>=1:  # yum > 3.1.1
+            if cmp(yumver,'3.1.1')>0:  # > 3.1.1
                 self.repos.populateSack(which=[repo.id], mdtype='filelists')  # since 3.1.1
             else:
                 self.repos.populateSack(which=[repo.id], with='filelists')
@@ -193,10 +192,10 @@
         self.needed[pkg.repoid].setdefault('rpms',[])
         self.needed[pkg.repoid].setdefault('debug',[])
         
-        if yumver[0]>=3 and yumver[1]>=2 and len(yumver)>=3 and yumver[2]>=17:  # yum > 3.2.17
-            (n,a,e,v,r) = pkg.pkgtup
-        else:
+        if cmp(yumver,'2.9.6')<0:  # < 2.9.6
             (n,a,e,v,r) = pkg.returnPackageTuple()
+        else:
+            (n,a,e,v,r) = pkg.pkgtup
         file = '%s-%s-%s.%s.rpm' % (n,v,r,a)
         if file not in self.needed[pkg.repoid]['rpms']:
             self.needed[pkg.repoid]['rpms'].append(file)