From 0d64cf3a3742a59001455e70d8169879a65d5209 Mon Sep 17 00:00:00 2001 From: James Antill Date: Dec 10 2009 14:57:39 +0000 Subject: - Fixes the mash bug, lookup in the tsInfo too. :( --- diff --git a/rpmdb-cache-BIG-post-releasever.path b/rpmdb-cache-BIG-post-releasever.path index 10f8301..2e43fe3 100644 --- a/rpmdb-cache-BIG-post-releasever.path +++ b/rpmdb-cache-BIG-post-releasever.path @@ -997,3 +997,26 @@ index 83d9d00..4fe2fe1 100644 if len(extcmds) == 0: base.logger.critical(_('Error: clean requires an option: %s') % ( +commit dbcdcd605d233c555f3ce3861152a2378bf9e622 +Author: James Antill +Date: Thu Dec 10 09:46:00 2009 -0500 + + Fix when we have file require(s) from just to be installed pkgs. The mash bug + +diff --git a/yum/depsolve.py b/yum/depsolve.py +index b5953c2..d46452c 100644 +--- a/yum/depsolve.py ++++ b/yum/depsolve.py +@@ -1009,7 +1009,11 @@ class Depsolve(object): + continue + + for pkgtup in reverselookup[filename]: +- po = self.getInstalledPackageObject(pkgtup) ++ po = self.tsInfo.getMembersWithState(pkgtup, TS_INSTALL_STATES) ++ if po: ++ po = po[0] # Should only have one ++ else: ++ po = self.getInstalledPackageObject(pkgtup) + ret.append( (po, (filename, 0, '')) ) + + self.rpmdb.transactionCacheFileRequires(self.installedFileRequires, diff --git a/yum.spec b/yum.spec index 605ac94..3f77272 100644 --- a/yum.spec +++ b/yum.spec @@ -3,7 +3,7 @@ Summary: RPM installer/updater Name: yum Version: 3.2.25 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz @@ -112,7 +112,7 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/lib/yum-plugins %changelog -* Thu Dec 10 2009 James Antill - 3.2.25-5 +* Thu Dec 10 2009 James Antill - 3.2.25-6 - Fixes the mash bug, lookup in the tsInfo too. :( * Fri Dec 4 2009 James Antill - 3.2.25-4