From d5925b126169096dffdf45ada6c06f3b4ed5a5a9 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jun 09 2014 09:50:27 +0000 Subject: import yum-3.4.3-118.el7 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2198751 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/yum-3.4.3.tar.gz diff --git a/SOURCES/BZ-1058297-remove-del-for-weird-anaconda-C-NULL-exception.patch b/SOURCES/BZ-1058297-remove-del-for-weird-anaconda-C-NULL-exception.patch index 61aac61..82e673d 100644 --- a/SOURCES/BZ-1058297-remove-del-for-weird-anaconda-C-NULL-exception.patch +++ b/SOURCES/BZ-1058297-remove-del-for-weird-anaconda-C-NULL-exception.patch @@ -16,3 +16,22 @@ index 347a07a..cdc08a0 100644 # This screws up the length, but that shouldn't matter. We only care # if this checksum == what we expect. +commit 7cd5919c13e4e5efbd9c0b291124893e550e3633 +Author: Vratislav Podzimek +Date: Tue Apr 15 09:46:23 2014 -0400 + + Remove CHUNK argument from open, in checksum. BZ 1058297. + +diff --git a/yum/misc.py b/yum/misc.py +index cdc08a0..6850ae2 100644 +--- a/yum/misc.py ++++ b/yum/misc.py +@@ -351,7 +351,7 @@ def checksum(sumtype, file, CHUNK=2**16, datasize=None): + if type(file) not in types.StringTypes: + fo = file # assume it's a file-like-object + else: +- fo = open(file, 'r', CHUNK) ++ fo = open(file, 'r') + + data = Checksums([sumtype]) + while data.read(fo, CHUNK): diff --git a/SPECS/yum.spec b/SPECS/yum.spec index a345edb..11d0cc6 100644 --- a/SPECS/yum.spec +++ b/SPECS/yum.spec @@ -36,7 +36,7 @@ BuildRequires: bash-completion Summary: RPM package installer/updater/manager Name: yum Version: 3.4.3 -Release: 117%{?dist} +Release: 118%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://yum.baseurl.org/download/3.4/%{name}-%{version}.tar.gz @@ -430,6 +430,10 @@ exit 0 %endif %changelog +* Tue Apr 15 2014 James Antill - 3.4.3-118 +- Remove CHUNK argument from open() for weird anaconda C NULL exception. +- Resolves: rhbz#1058297 + * Tue Apr 8 2014 James Antill - 3.4.3-117 - Remove del for weird anaconda C NULL exception. - Resolves: rhbz#1058297