Pisilinux3/pisi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

archive: Fix failure when a directory is changed with a symlink

Browse Source
This commit is contained in:
Fatih Aşıcı
2011-03-31 11:37:55 +00:00
parent 3357b987ad
commit 6f1c2dd6c1
1 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/archive.py
+40 -1
View File
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
# Copyright (C) 2005-2010, TUBITAK/UEKAE
# Copyright (C) 2005-2011, TUBITAK/UEKAE
#
# This program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free
@@ -297,6 +297,45 @@ class ArchiveTar(ArchiveBase):
if callback:
callback(tarinfo, extracted=False)
if tarinfo.issym() and \
os.path.isdir(tarinfo.name) and \
not os.path.islink(tarinfo.name):
# Changing a directory with a symlink. tarfile module
# cannot handle this case.
if os.path.isdir(tarinfo.linkname):
# Symlink target is a directory. Move old directory's
# content to this directory.
for filename in os.listdir(tarinfo.name):
old_path = util.join_path(tarinfo.name, filename)
new_path = util.join_path(tarinfo.linkname, filename)
if os.path.lexists(new_path):
if not os.path.isdir(new_path):
# A file with the same name exists in the
# target. Remove the one in the old directory.
os.remove(old_path)
continue
os.renames(old_path, new_path)
os.rmdir(tarinfo.name)
elif not os.path.lexists(tarinfo.linkname):
# Symlink target does not exist. Assume the old
# directory is moved to another place in package.
os.renames(tarinfo.name, tarinfo.linkname)
else:
# This should not happen. Probably a packaging error.
# Try to rename directory
try:
os.rename(tarinfo.name,
"%s.renamed-by-pisi" % tarinfo.name)
except:
# If fails, try to remove it
shutil.rmtree(tarinfo.name)
self.tar.extract(tarinfo)
# tarfile.extract does not honor umask. It must be honored