[yum-cvs] yum/yum depsolve.py,1.78,1.79

[Jeremy Katz]

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

Modified Files:
	depsolve.py 
Log Message:
fix error message for conflicts (rh#168687)


Index: depsolve.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/depsolve.py,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- depsolve.py	16 Jan 2006 20:42:12 -0000	1.78
+++ depsolve.py	28 Feb 2006 00:29:18 -0000	1.79
@@ -191,9 +191,15 @@
                     for deptuple in deps:
                         ((name, version, release), (needname, needversion), flags, 
                           suggest, sense) = deptuple
-                        msg = 'Package %s needs %s, this is not available.' % \
-                              (name, rpmUtils.miscutils.formatRequire(needname, 
-                                                            needversion, flags))
+                        if sense == rpm.RPMDEP_SENSE_REQUIRES:
+                            msg = 'Package %s needs %s, this is not available.' % \
+                                  (name, rpmUtils.miscutils.formatRequire(needname, 
+                                                                          needversion, flags))
+                        elif sense == rpm.RPMDEP_SENSE_CONFLICTS:
+                            msg = 'Package %s conflicts with %s.' % \
+                                  (name, rpmUtils.miscutils.formatRequire(needname, 
+                                                                          needversion, flags))
+
                         errors.append(msg)
                     CheckDeps = 0
                     break