Fix closes issue10761: tarfile.extractall failure when symlinked files are present.
This commit is contained in:
parent
bdfa2e69e2
commit
011525ee92
|
@ -2239,6 +2239,8 @@ class TarFile(object):
|
|||
if hasattr(os, "symlink") and hasattr(os, "link"):
|
||||
# For systems that support symbolic and hard links.
|
||||
if tarinfo.issym():
|
||||
if os.path.exists(targetpath):
|
||||
os.unlink(targetpath)
|
||||
os.symlink(tarinfo.linkname, targetpath)
|
||||
else:
|
||||
# See extract().
|
||||
|
|
|
@ -843,6 +843,33 @@ class WriteTest(WriteTestBase):
|
|||
finally:
|
||||
os.chdir(cwd)
|
||||
|
||||
def test_extractall_symlinks(self):
|
||||
# Test if extractall works properly when tarfile contains symlinks
|
||||
tempdir = os.path.join(TEMPDIR, "testsymlinks")
|
||||
temparchive = os.path.join(TEMPDIR, "testsymlinks.tar")
|
||||
os.mkdir(tempdir)
|
||||
try:
|
||||
source_file = os.path.join(tempdir,'source')
|
||||
target_file = os.path.join(tempdir,'symlink')
|
||||
with open(source_file,'w') as f:
|
||||
f.write('something\n')
|
||||
os.symlink(source_file, target_file)
|
||||
tar = tarfile.open(temparchive,'w')
|
||||
tar.add(source_file, arcname=os.path.basename(source_file))
|
||||
tar.add(target_file, arcname=os.path.basename(target_file))
|
||||
tar.close()
|
||||
# Let's extract it to the location which contains the symlink
|
||||
tar = tarfile.open(temparchive,'r')
|
||||
# this should not raise OSError: [Errno 17] File exists
|
||||
try:
|
||||
tar.extractall(path=tempdir)
|
||||
except OSError:
|
||||
self.fail("extractall failed with symlinked files")
|
||||
finally:
|
||||
tar.close()
|
||||
finally:
|
||||
os.unlink(temparchive)
|
||||
shutil.rmtree(tempdir)
|
||||
|
||||
class StreamWriteTest(WriteTestBase):
|
||||
|
||||
|
|
Loading…
Reference in New Issue