merge heads

2d6a58b9 · Gregory P. Smith · 8907dcd3 · 5135e9ed · 2d6a58b9 · 2d6a58b9
Commit 2d6a58b9 authored Jun 11, 2016 by Gregory P. Smith
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

Lib/tarfile.py Lib/tarfile.py +2 -2

Misc/ACKS Misc/ACKS +1 -0

No files found.
--- 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

--- 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