[yum/f16] Backport upstream fix for RHBZ#731717.
Richard W.M. Jones
rjones at fedoraproject.org
Mon Sep 26 09:11:02 UTC 2011
commit 7b107a5251cace8021f25c6ab7670d8ad8750c88
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Mon Sep 26 10:05:40 2011 +0100
Backport upstream fix for RHBZ#731717.
...ving_failed-as-soon-as-buildTransaction-i.patch | 13 +++++++++++++
yum.spec | 7 ++++++-
2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/0001-Set-_depsolving_failed-as-soon-as-buildTransaction-i.patch b/0001-Set-_depsolving_failed-as-soon-as-buildTransaction-i.patch
new file mode 100644
index 0000000..29540b8
--- /dev/null
+++ b/0001-Set-_depsolving_failed-as-soon-as-buildTransaction-i.patch
@@ -0,0 +1,13 @@
+--- yum-3.4.3.old/yum/__init__.py 2011-09-26 10:06:24.876279470 +0100
++++ yum-3.4.3/yum/__init__.py 2011-09-26 10:07:35.819800317 +0100
+@@ -966,6 +966,10 @@
+ def buildTransaction(self, unfinished_transactions_check=True):
+ """go through the packages in the transaction set, find them in the
+ packageSack or rpmdb, and pack up the ts accordingly"""
++ # FIXME: This is horrible, see below and yummain. Maybe create a real
++ # rescode object? :(
++ self._depsolving_failed = False
++
+ if (unfinished_transactions_check and
+ misc.find_unfinished_transactions(yumlibpath=self.conf.persistdir)):
+ msg = _('There are unfinished transactions remaining. You might ' \
diff --git a/yum.spec b/yum.spec
index b7a3302..604e7f6 100644
--- a/yum.spec
+++ b/yum.spec
@@ -7,7 +7,7 @@
Summary: RPM package installer/updater/manager
Name: yum
Version: 3.4.3
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv2+
Group: System Environment/Base
Source0: http://yum.baseurl.org/download/3.4/%{name}-%{version}.tar.gz
@@ -21,6 +21,7 @@ Patch5: geode-arch.patch
Patch6: yum-HEAD.patch
Patch7: yum-ppc64-preferred.patch
Patch20: yum-manpage-files.patch
+Patch21: 0001-Set-_depsolving_failed-as-soon-as-buildTransaction-i.patch
URL: http://yum.baseurl.org/
BuildArch: noarch
@@ -126,6 +127,7 @@ Install this package if you want auto yum updates nightly via cron.
%patch6 -p1
%patch7 -p1
%patch20 -p1
+%patch21 -p1
%build
make
@@ -248,6 +250,9 @@ exit 0
%config(noreplace) %{_sysconfdir}/sysconfig/yum-cron
%changelog
+* Mon Sep 26 2011 Richard W.M. Jones <rjones at redhat.com> - 3.4.3-5
+- Backport upstream fix for RHBZ#731717.
+
* Fri Jul 15 2011 James Antill <james at fedoraproject.org> - 3.4.3-4
- update to latest HEAD
- Weird old bugs fixed for new createrepo code.
More information about the scm-commits
mailing list