rpms/yum/devel yum-HEAD.patch,1.24,1.25 yum.spec,1.263,1.264

[James Antill]

Author: james

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

Modified Files:
	yum-HEAD.patch yum.spec 
Log Message:
* Mon Jun 22 2009 James Antill <james at fedoraproject.org> - 3.2.23-8
- Update to latest head:
- Fix old recursion bug, found by new code.
- Resolves: bug#507220


yum-HEAD.patch:

Index: yum-HEAD.patch
===================================================================
RCS file: /cvs/pkgs/rpms/yum/devel/yum-HEAD.patch,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- yum-HEAD.patch	21 Jun 2009 06:10:34 -0000	1.24
+++ yum-HEAD.patch	22 Jun 2009 06:02:28 -0000	1.25
@@ -7324,7 +7324,7 @@ index 322765e..6f0ffe4 100644
      pass
  
 diff --git a/yum/__init__.py b/yum/__init__.py
-index 6378cdc..2a1f806 100644
+index 6378cdc..ae70354 100644
 --- a/yum/__init__.py
 +++ b/yum/__init__.py
 @@ -43,8 +43,7 @@ except ImportError:
@@ -7402,6 +7402,15 @@ index 6378cdc..2a1f806 100644
          self._rpmdb = None
          self._ts = None
          self._tsInfo = None
+@@ -467,7 +483,7 @@ class YumBase(depsolve.Depsolve):
+         """populates the package sacks for information from our repositories,
+            takes optional archlist for archs to include"""
+ 
+-        if self._pkgSack and thisrepo is None:
++        if self._pkgSack is not None and thisrepo is None:
+             return self._pkgSack
+         
+         if thisrepo is None:
 @@ -478,7 +494,7 @@ class YumBase(depsolve.Depsolve):
          self.verbose_logger.debug(_('Setting up Package Sacks'))
          sack_st = time.time()


Index: yum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum/devel/yum.spec,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -p -r1.263 -r1.264
--- yum.spec	22 Jun 2009 05:57:48 -0000	1.263
+++ yum.spec	22 Jun 2009 06:02:28 -0000	1.264
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 3.2.23
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz
@@ -104,7 +104,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/lib/yum-plugins
 
 %changelog
-* Mon Jun 22 2009 James Antill <james at fedoraproject.org> - 3.2.23-7
+* Mon Jun 22 2009 James Antill <james at fedoraproject.org> - 3.2.23-8
 - Update to latest head:
 - Fix old recursion bug, found by new code.
 - Resolves: bug#507220