fedora-rpmdevtools rpmdev-vercmp, 1.2, 1.3 rpmdevtools.spec, 1.32, 1.33

[Ville Skytta (scop)]

Author: scop

Update of /cvs/fedora/fedora-rpmdevtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23800

Modified Files:
	rpmdev-vercmp rpmdevtools.spec 
Log Message:
Fix Epoch handling in the 2-arg form of rpmdev-vercmp with yum < 3.1.2.


Index: rpmdev-vercmp
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdev-vercmp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rpmdev-vercmp	27 Jun 2007 17:09:36 -0000	1.2
+++ rpmdev-vercmp	7 Jul 2007 08:46:29 -0000	1.3
@@ -36,6 +36,10 @@
         if have_miscutils:
             (e1, v1, r1) = stringToVersion(sys.argv[1])
             (e2, v2, r2) = stringToVersion(sys.argv[2])
+            # stringToVersion in yum < 3.1.2 may return numeric (non-string)
+            # Epochs, and labelCompare does not like that.
+            if e1 is not None: e1 = str(e1)
+            if e2 is not None: e2 = str(e2)
         else:
             print """
 Sorry, the 2-argument form is available only if rpmUtils.miscutils (which


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdevtools.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- rpmdevtools.spec	5 Jul 2007 21:26:42 -0000	1.32
+++ rpmdevtools.spec	7 Jul 2007 08:46:29 -0000	1.33
@@ -110,6 +110,9 @@
 
 
 %changelog
+* Sat Jul  7 2007 Ville Skyttä <ville.skytta at iki.fi>
+- Fix Epoch handling in the 2-arg form of rpmdev-vercmp with yum < 3.1.2.
+
 * Thu Jul  5 2007 Ville Skyttä <ville.skytta at iki.fi> - 6.0-1
 - Remove check-{buildroot,rpaths*}, now included in rpm-build >= 4.4.2.1.
 - Drop explicit dependency on patch, pulled in by recent rpm-build.