|
 |
1f1d7d |
commit 4ec4888593f739328600d42c1ad5a33d6b72674a
|
|
|
1f1d7d |
Author: Vratislav Podzimek <vpodzime@redhat.com>
|
|
|
1f1d7d |
Date: Tue Apr 8 09:37:01 2014 -0400
|
|
|
1f1d7d |
|
|
|
1f1d7d |
Remove extra del(fo) for weird C NULL execption (it is valid). BZ 1058297.
|
|
|
1f1d7d |
|
|
|
1f1d7d |
diff --git a/yum/misc.py b/yum/misc.py
|
|
|
1f1d7d |
index 347a07a..cdc08a0 100644
|
|
|
1f1d7d |
--- a/yum/misc.py
|
|
|
1f1d7d |
+++ b/yum/misc.py
|
|
|
1f1d7d |
@@ -360,7 +360,6 @@ def checksum(sumtype, file, CHUNK=2**16, datasize=None):
|
|
|
1f1d7d |
|
|
|
1f1d7d |
if type(file) is types.StringType:
|
|
|
1f1d7d |
fo.close()
|
|
|
1f1d7d |
- del fo
|
|
|
1f1d7d |
|
|
|
1f1d7d |
# This screws up the length, but that shouldn't matter. We only care
|
|
|
1f1d7d |
# if this checksum == what we expect.
|
|
|
d5925b |
commit 7cd5919c13e4e5efbd9c0b291124893e550e3633
|
|
|
d5925b |
Author: Vratislav Podzimek <vpodzime@redhat.com>
|
|
|
d5925b |
Date: Tue Apr 15 09:46:23 2014 -0400
|
|
|
d5925b |
|
|
|
d5925b |
Remove CHUNK argument from open, in checksum. BZ 1058297.
|
|
|
d5925b |
|
|
|
d5925b |
diff --git a/yum/misc.py b/yum/misc.py
|
|
|
d5925b |
index cdc08a0..6850ae2 100644
|
|
|
d5925b |
--- a/yum/misc.py
|
|
|
d5925b |
+++ b/yum/misc.py
|
|
|
d5925b |
@@ -351,7 +351,7 @@ def checksum(sumtype, file, CHUNK=2**16, datasize=None):
|
|
|
d5925b |
if type(file) not in types.StringTypes:
|
|
|
d5925b |
fo = file # assume it's a file-like-object
|
|
|
d5925b |
else:
|
|
|
d5925b |
- fo = open(file, 'r', CHUNK)
|
|
|
d5925b |
+ fo = open(file, 'r')
|
|
|
d5925b |
|
|
|
d5925b |
data = Checksums([sumtype])
|
|
|
d5925b |
while data.read(fo, CHUNK):
|