rpms/yum/devel rpmdb-cache-BIG-post-releasever.path, 1.3, 1.4 yum.spec, 1.287, 1.288
James Antill
james at fedoraproject.org
Thu Dec 10 14:57:40 UTC 2009
- Previous message (by thread): rpms/arora/F-12 arora-0.10.2-fedorahome.patch, NONE, 1.1 arora-0.10.2-gitversion.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 arora.spec, 1.22, 1.23 sources, 1.12, 1.13 arora-0.10.0-fedorahome.patch, 1.1, NONE arora-0.10.1-gitversion.patch, 1.1, NONE
- Next message (by thread): rpms/sysstat/F-12 sysstat-9.0.4-nfs.patch, NONE, 1.1 sysstat.spec, 1.73, 1.74
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: james
Update of /cvs/pkgs/rpms/yum/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24547
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-6
- Fixes the mash bug, lookup in the tsInfo too. :(
Index: rpmdb-cache-BIG-post-releasever.path
===================================================================
RCS file: /cvs/pkgs/rpms/yum/devel/rpmdb-cache-BIG-post-releasever.path,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- rpmdb-cache-BIG-post-releasever.path 4 Dec 2009 14:26:31 -0000 1.3
+++ rpmdb-cache-BIG-post-releasever.path 10 Dec 2009 14:57:39 -0000 1.4
@@ -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 <james at and.org>
+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,
Index: yum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum/devel/yum.spec,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -p -r1.287 -r1.288
--- yum.spec 10 Dec 2009 14:49:08 -0000 1.287
+++ yum.spec 10 Dec 2009 14:57:39 -0000 1.288
@@ -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 <james at fedoraproject.org> - 3.2.25-5
+* Thu Dec 10 2009 James Antill <james at fedoraproject.org> - 3.2.25-6
- Fixes the mash bug, lookup in the tsInfo too. :(
* Fri Dec 4 2009 James Antill <james at fedoraproject.org> - 3.2.25-4
- Previous message (by thread): rpms/arora/F-12 arora-0.10.2-fedorahome.patch, NONE, 1.1 arora-0.10.2-gitversion.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 arora.spec, 1.22, 1.23 sources, 1.12, 1.13 arora-0.10.0-fedorahome.patch, 1.1, NONE arora-0.10.1-gitversion.patch, 1.1, NONE
- Next message (by thread): rpms/sysstat/F-12 sysstat-9.0.4-nfs.patch, NONE, 1.1 sysstat.spec, 1.73, 1.74
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list