From 1e5dc5d3340dd53aac96cd4fdb9a7f4ca4c7d175 Mon Sep 17 00:00:00 2001 From: James Antill Date: Mar 12 2015 19:09:06 +0000 Subject: Hacky fix for recursion problem with cashe. BZ#1199315 --- diff --git a/yum-HEAD.patch b/yum-HEAD.patch index b9a2e3d..d5957d9 100644 --- a/yum-HEAD.patch +++ b/yum-HEAD.patch @@ -201266,14 +201266,14 @@ index 5ef9951..8365f16 100644 except Errors.MiscError: + if from_cashe: + self._cashe.unlink() -+ elif nst.st_size >= self.packagesize: ++ elif False and nst.st_size >= self.packagesize: + return self.verifyLocalPkg() # Try: cashe return False if filesum != csum: + if from_cashe: + self._cashe.unlink() -+ elif nst.st_size >= self.packagesize: ++ elif False and nst.st_size >= self.packagesize: + return self.verifyLocalPkg() # Try: cashe return False diff --git a/yum.spec b/yum.spec index 216c42b..4fe5f0a 100644 --- a/yum.spec +++ b/yum.spec @@ -64,7 +64,7 @@ BuildRequires: bash-completion Summary: RPM package installer/updater/manager Name: yum Version: 3.4.3 -Release: 156%{?dist} +Release: 157%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://yum.baseurl.org/download/3.4/%{name}-%{version}.tar.gz @@ -510,6 +510,9 @@ exit 0 %endif %changelog +* Thu Mar 12 2015 James Antill - 3.4.3-157 +- Hacky fix for recursion problem with cashe. BZ#1199315 + * Wed Mar 4 2015 James Antill - 3.4.3-156 - update to latest HEAD - Have "yum check" ignore self conflicts.