[yum-cvs] yum/yum packages.py,1.97,1.98

Jeremy Katz katzj at linux.duke.edu
Mon Feb 19 22:35:28 UTC 2007


Update of /home/groups/yum/cvs/yum/yum
In directory login1.linux.duke.edu:/tmp/cvs-serv9765/yum

Modified Files:
	packages.py 
Log Message:
if a package requires foo-version without a release, we need to match that
as being satisfied with a provide of foo-version-*.

eg,
  glest-data requires glest = 2.0.0
  glest provides glest = 2.0.0-5.fc7


Index: packages.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/packages.py,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- packages.py	19 Feb 2007 18:39:18 -0000	1.97
+++ packages.py	19 Feb 2007 22:35:26 -0000	1.98
@@ -284,6 +284,10 @@
                 if reqv is None: # just for the record if ver is None then we're going to segfault
                     v = None
 
+                # if we just require foo-version, then foo-version-* will match
+                if r is None:
+                    reqr = None
+
                 rc = rpmUtils.miscutils.compareEVR((e, v, r), (reqe, reqv, reqr))
                 
                 # does not match unless




More information about the Yum-cvs-commits mailing list