devel/yum yum-misc-fixes.patch,1.13,1.14 yum.spec,1.184,1.185

[Jeremy Katz (katzj)]

Author: katzj

Update of /cvs/pkgs/devel/yum
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16960

Modified Files:
	yum-misc-fixes.patch yum.spec 
Log Message:
* Thu Oct 11 2007 Jeremy Katz <katzj at redhat.com> - 3.2.6-5
- fix corner case obsoletes depsolving bug


yum-misc-fixes.patch:

Index: yum-misc-fixes.patch
===================================================================
RCS file: /cvs/pkgs/devel/yum/yum-misc-fixes.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- yum-misc-fixes.patch	11 Oct 2007 15:41:12 -0000	1.13
+++ yum-misc-fixes.patch	11 Oct 2007 19:41:32 -0000	1.14
@@ -136,3 +136,21 @@
      }
  
      # Retrieve the timestamp from the matching signature packet 
+diff --git a/yum/depsolve.py b/yum/depsolve.py
+index d3a8575..3f0f962 100644
+--- a/yum/depsolve.py
++++ b/yum/depsolve.py
+@@ -300,6 +300,13 @@ class Depsolve(object):
+                 # check for mode by just the name
+                 thismode = self.tsInfo.getMode(name=i_n)
+                             
++            # if this package is being obsoleted, it's just like if it's
++            # being upgraded as far as checking for other providers
++            if thismode is None:
++                if filter(lambda x: x.obsoleted_by,
++                          self.tsInfo.matchNaevr(i_n, i_a, i_e, i_v, i_r)):
++                    thismode = 'u'
++
+             if thismode is not None:
+                 needmode = thismode
+ 


Index: yum.spec
===================================================================
RCS file: /cvs/pkgs/devel/yum/yum.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- yum.spec	11 Oct 2007 15:41:12 -0000	1.184
+++ yum.spec	11 Oct 2007 19:41:32 -0000	1.185
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 3.2.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://linux.duke.edu/projects/yum/download/3.2/%{name}-%{version}.tar.gz
@@ -95,6 +95,9 @@
 %dir /usr/lib/yum-plugins
 
 %changelog
+* Thu Oct 11 2007 Jeremy Katz <katzj at redhat.com> - 3.2.6-5
+- fix corner case obsoletes depsolving bug
+
 * Thu Oct 11 2007 Jeremy Katz <katzj at redhat.com> - 3.2.6-4
 - fix typo in one of yesterday's patches