rpms/yum/devel rpmdb-cache-BIG-post-releasever.path, 1.4, 1.5 yum.spec, 1.288, 1.289

[James Antill]

Author: james

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

Modified Files:
	rpmdb-cache-BIG-post-releasever.path yum.spec 
Log Message:
* Thu Dec 10 2009 James Antill <james at fedoraproject.org> - 3.2.25-7
- Fixes the mash bug, lookup in the tsInfo too. :(
- And fix the txmbr/po confusion ... third build the charm.



Index: rpmdb-cache-BIG-post-releasever.path
===================================================================
RCS file: /cvs/pkgs/rpms/yum/devel/rpmdb-cache-BIG-post-releasever.path,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- rpmdb-cache-BIG-post-releasever.path	10 Dec 2009 14:57:39 -0000	1.4
+++ rpmdb-cache-BIG-post-releasever.path	10 Dec 2009 23:29:50 -0000	1.5
@@ -1020,3 +1020,22 @@ index b5953c2..d46452c 100644
                  ret.append( (po, (filename, 0, '')) )
  
          self.rpmdb.transactionCacheFileRequires(self.installedFileRequires, 
+commit 67882783e6add4c5c9b717872554c23fc0ade913
+Author: James Antill <james at and.org>
+Date:   Thu Dec 10 18:28:28 2009 -0500
+
+    getMembers returns txmbrs not POs ... *sigh*
+
+diff --git a/yum/depsolve.py b/yum/depsolve.py
+index d46452c..a09bd4b 100644
+--- a/yum/depsolve.py
++++ b/yum/depsolve.py
+@@ -1011,7 +1011,7 @@ class Depsolve(object):
+             for pkgtup in reverselookup[filename]:
+                 po = self.tsInfo.getMembersWithState(pkgtup, TS_INSTALL_STATES)
+                 if po:
+-                    po = po[0] # Should only have one
++                    po = po[0].po # Should only have one
+                 else:
+                     po = self.getInstalledPackageObject(pkgtup)
+                 ret.append( (po, (filename, 0, '')) )


Index: yum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum/devel/yum.spec,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -p -r1.288 -r1.289
--- yum.spec	10 Dec 2009 14:57:39 -0000	1.288
+++ yum.spec	10 Dec 2009 23:29:50 -0000	1.289
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 3.2.25
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz
@@ -112,8 +112,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/lib/yum-plugins
 
 %changelog
-* Thu Dec 10 2009 James Antill <james at fedoraproject.org> - 3.2.25-6
+* Thu Dec 10 2009 James Antill <james at fedoraproject.org> - 3.2.25-7
 - Fixes the mash bug, lookup in the tsInfo too. :(
+- And fix the txmbr/po confusion ... third build the charm.
 
 * Fri Dec  4 2009 James Antill <james at fedoraproject.org> - 3.2.25-4
 - Fixes for yum clean all, BZ 544173