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

archive: Fix ArchiveZip adding empty dirs with incorrect paths

Browse Source
This commit is contained in:
Fatih Aşıcı
2010-06-22 06:12:00 +00:00
parent 16e5da00a7
commit a038fcb986
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/archive.py
+4 -3
View File
@@ -448,11 +448,12 @@ class ArchiveZip(ArchiveBase):
# It's a pity that zipfile can't handle unicode strings. Grrr! # It's a pity that zipfile can't handle unicode strings. Grrr!
file_name = str(file_name) file_name = str(file_name)
if os.path.isdir(file_name) and not os.path.islink(file_name): if os.path.isdir(file_name) and not os.path.islink(file_name):
self.zip_obj.writestr(file_name + '/', '') self.zip_obj.writestr(arc_name + '/', '')
attr_obj = self.zip_obj.getinfo(file_name + '/') attr_obj = self.zip_obj.getinfo(arc_name + '/')
attr_obj.external_attr = stat.S_IMODE(os.stat(file_name)[0]) << 16L attr_obj.external_attr = stat.S_IMODE(os.stat(file_name)[0]) << 16L
for f in os.listdir(file_name): for f in os.listdir(file_name):
self.add_to_archive(os.path.join(file_name, f)) self.add_to_archive(os.path.join(file_name, f),
os.path.join(arc_name, f))
else: else:
if os.path.islink(file_name): if os.path.islink(file_name):
dest = os.readlink(file_name) dest = os.readlink(file_name)