summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorŁukasz Langa <lukasz@langa.pl>2016-06-11 23:56:18 (GMT)
committerŁukasz Langa <lukasz@langa.pl>2016-06-11 23:56:18 (GMT)
commit5135e9ed51b6c90d77b4803b3bde5b59035163b0 (patch)
tree693a8a9094b6e7d783b53506f904803cf6fb2583
parent6a7506a77f11235b2f1f0e97a2f2eb57e6953d88 (diff)
parente7f27481a895fb73408e523202345fcd9355b00c (diff)
downloadcpython-5135e9ed51b6c90d77b4803b3bde5b59035163b0.zip
cpython-5135e9ed51b6c90d77b4803b3bde5b59035163b0.tar.gz
cpython-5135e9ed51b6c90d77b4803b3bde5b59035163b0.tar.bz2
Merge 3.5, issue #27194
-rwxr-xr-xLib/tarfile.py4
-rw-r--r--Misc/ACKS1
2 files changed, 3 insertions, 2 deletions
diff --git a/Lib/tarfile.py b/Lib/tarfile.py
index 8ed87c2..df4745d 100755
--- a/Lib/tarfile.py
+++ b/Lib/tarfile.py
@@ -2153,10 +2153,10 @@ class TarFile(object):
for offset, size in tarinfo.sparse:
target.seek(offset)
copyfileobj(source, target, size, ReadError)
+ target.seek(tarinfo.size)
+ target.truncate()
else:
copyfileobj(source, target, tarinfo.size, ReadError)
- target.seek(tarinfo.size)
- target.truncate()
def makeunknown(self, tarinfo, targetpath):
"""Make a file from a TarInfo object with an unknown type
diff --git a/Misc/ACKS b/Misc/ACKS
index bfdd107..860eeb3 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -462,6 +462,7 @@ Stefan Franke
Martin Franklin
Kent Frazier
Bruce Frederiksen
+Jason Fried
Robin Friedrich
Bradley Froehle
Ivan Frohne