[yum-cvs] yum/rpmUtils __init__.py,1.21,1.22

[Gijs Hollestelle]

Update of /home/groups/yum/cvs/yum/rpmUtils
In directory login:/tmp/cvs-serv2662

Modified Files:
	__init__.py 
Log Message:
Fixed an inconsistency between rpm and yum, allow unversioned provides to
fulfill versioned requires.



Index: __init__.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/rpmUtils/__init__.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- __init__.py	15 Jan 2005 05:22:43 -0000	1.21
+++ __init__.py	25 Apr 2005 09:39:14 -0000	1.22
@@ -277,7 +277,10 @@
                     match_r = pkg_r
                     
                 matchtuple = (match_n, match_a, match_e, match_v, match_r)
-                if miscutils.rangeCheck(provtuple, matchtuple):
+                # This provides matches if the version is in the requested
+                # range or the providing package provides the resource
+                # without a version (meaning that it matches all EVR) 
+                if miscutils.rangeCheck(provtuple, matchtuple) or (match_v == None):
                     matches.append(pkgtuple)
         del matchingHdrs
         return miscutils.unique(matches)