merge heads

gpshead · gpshead · commit 2d6a58b96fed · 2016-06-11T17:56:40.000-07:00
diff --git a/Lib/tarfile.py b/Lib/tarfile.py
@@ -2153,10 +2153,10 @@ def makefile(self, tarinfo, targetpath):
                 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
@@ -462,6 +462,7 @@ Stefan Franke
 Martin Franklin
 Kent Frazier
 Bruce Frederiksen
+Jason Fried
 Robin Friedrich
 Bradley Froehle
 Ivan Frohne
