rpms/yum/devel yum-3.2.20-obsoletes-dict-fix.patch, NONE, 1.1 yum.spec, 1.230, 1.231

[Jesse Keating]

Author: jkeating

Update of /cvs/pkgs/rpms/yum/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15056

Modified Files:
	yum.spec 
Added Files:
	yum-3.2.20-obsoletes-dict-fix.patch 
Log Message:
* Thu Dec 04 2008 Jesse Keating <jkeating at redhat.com> - 3.2.20-6
- Add patch from upstream to fix cases where obsoletes are disabled. (jantill)


yum-3.2.20-obsoletes-dict-fix.patch:

--- NEW FILE yum-3.2.20-obsoletes-dict-fix.patch ---
commit a59165490ebc236f7682ebc157bf069497958b42
Author: James Antill <james at and.org>
Date:   Thu Dec 4 18:58:59 2008 -0500

    Always have an obsoletes dict, so we can always call getObsoletesTuples() etc.

diff --git a/rpmUtils/updates.py b/rpmUtils/updates.py
index f348ae9..16f733b 100644
--- a/rpmUtils/updates.py
+++ b/rpmUtils/updates.py
@@ -54,6 +54,7 @@ class Updates:
         self.updating_dict = {}
         #debug, ignore me
         self.debug = 0
+        self.obsoletes = {}
 
     def _delFromDict(self, dict_, keys, value):
         for key in keys:


Index: yum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum/devel/yum.spec,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -r1.230 -r1.231
--- yum.spec	29 Nov 2008 15:49:48 -0000	1.230
+++ yum.spec	5 Dec 2008 00:18:00 -0000	1.231
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 3.2.20
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz
@@ -13,6 +13,7 @@
 Patch1: yum-mirror-priority.patch
 Patch2: yum-manpage-files.patch
 Patch3: yum-multilib-policy-best.patch
+Patch4: yum-3.2.20-obsoletes-dict-fix.patch
 
 # Patches from 3.2.X HEAD
 Patch101: yum-HEAD.patch
@@ -58,6 +59,7 @@
 %patch1 -p0
 %patch2 -p0
 %patch3 -p0
+%patch4 -p1
 
 %patch101 -p1
 
@@ -108,6 +110,9 @@
 %dir /usr/lib/yum-plugins
 
 %changelog
+* Thu Dec 04 2008 Jesse Keating <jkeating at redhat.com> - 3.2.20-6
+- Add patch from upstream to fix cases where obsoletes are disabled. (jantill)
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 3.2.20-5
 - Rebuild for Python 2.6