From 8058b2935bad15f930a45a5f5f640c8da8aaf1f2 Mon Sep 17 00:00:00 2001 From: ubi de feo Date: Mon, 5 Feb 2024 08:18:19 +0100 Subject: [PATCH] tarfile-write: Fix permissions when adding to archive. Signed-off-by: ubi de feo --- python-stdlib/tarfile-write/manifest.py | 2 +- python-stdlib/tarfile-write/tarfile/write.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/python-stdlib/tarfile-write/manifest.py b/python-stdlib/tarfile-write/manifest.py index 248f7da..bc4f377 100644 --- a/python-stdlib/tarfile-write/manifest.py +++ b/python-stdlib/tarfile-write/manifest.py @@ -1,4 +1,4 @@ -metadata(description="Adds write (create/append) support to tarfile.", version="0.1.1") +metadata(description="Adds write (create/append) support to tarfile.", version="0.1.2") require("tarfile") package("tarfile") diff --git a/python-stdlib/tarfile-write/tarfile/write.py b/python-stdlib/tarfile-write/tarfile/write.py index 062b8ae..527b331 100644 --- a/python-stdlib/tarfile-write/tarfile/write.py +++ b/python-stdlib/tarfile-write/tarfile/write.py @@ -67,7 +67,7 @@ def addfile(self, tarinfo, fileobj=None): name += "/" hdr = uctypes.struct(uctypes.addressof(buf), _TAR_HEADER, uctypes.LITTLE_ENDIAN) hdr.name[:] = name.encode("utf-8")[:100] - hdr.mode[:] = b"%07o\0" % (tarinfo.mode & 0o7777) + hdr.mode[:] = b"%07o\0" % ((0o755 if tarinfo.isdir() else 0o644) & 0o7777) hdr.uid[:] = b"%07o\0" % tarinfo.uid hdr.gid[:] = b"%07o\0" % tarinfo.gid hdr.size[:] = b"%011o\0" % size @@ -96,9 +96,10 @@ def addfile(self, tarinfo, fileobj=None): def add(self, name, recursive=True): from . import TarInfo - tarinfo = TarInfo(name) try: stat = os.stat(name) + res_name = (name + '/') if (stat[0] & 0xf000) == 0x4000 else name + tarinfo = TarInfo(res_name) tarinfo.mode = stat[0] tarinfo.uid = stat[4] tarinfo.gid = stat[5]