summaryrefslogtreecommitdiff
path: root/Lib/distutils/archive_util.py
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2018-12-05 21:46:25 +0200
committerGitHub <noreply@github.com>2018-12-05 21:46:25 +0200
commit67a93b3a0b3814e97ef9d077b21325fc8ce351b2 (patch)
tree28bf007046f6b1257417d330ba4c5b68b40ad80c /Lib/distutils/archive_util.py
parent55f41e45b4318cbe19209f5144641344d0049fb8 (diff)
downloadcpython-git-67a93b3a0b3814e97ef9d077b21325fc8ce351b2.tar.gz
bpo-34738: Add directory entries in ZIP files created by distutils. (GH-9419)
Diffstat (limited to 'Lib/distutils/archive_util.py')
-rw-r--r--Lib/distutils/archive_util.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/Lib/distutils/archive_util.py b/Lib/distutils/archive_util.py
index 78ae5757c3..b002dc3b84 100644
--- a/Lib/distutils/archive_util.py
+++ b/Lib/distutils/archive_util.py
@@ -166,7 +166,15 @@ def make_zipfile(base_name, base_dir, verbose=0, dry_run=0):
zip = zipfile.ZipFile(zip_filename, "w",
compression=zipfile.ZIP_STORED)
+ if base_dir != os.curdir:
+ path = os.path.normpath(os.path.join(base_dir, ''))
+ zip.write(path, path)
+ log.info("adding '%s'", path)
for dirpath, dirnames, filenames in os.walk(base_dir):
+ for name in dirnames:
+ path = os.path.normpath(os.path.join(dirpath, name, ''))
+ zip.write(path, path)
+ log.info("adding '%s'", path)
for name in filenames:
path = os.path.normpath(os.path.join(dirpath, name))
if os.path.isfile(path):