diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2018-12-06 00:02:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-06 00:02:10 +0200 |
| commit | b2742ba5f9ce8a6108202e0645662f2b58da423b (patch) | |
| tree | af34d5b9b4559bd5f31b76d23bf3702473c05e58 /Lib/distutils/archive_util.py | |
| parent | abe74feb912292aa4df4e70d39e85d0bcd425436 (diff) | |
| download | cpython-git-b2742ba5f9ce8a6108202e0645662f2b58da423b.tar.gz | |
[2.7] bpo-34738: Add directory entries in ZIP files created by distutils. (GH-9419). (GH-10950)
(cherry picked from commit 67a93b3a0b3814e97ef9d077b21325fc8ce351b2)
Diffstat (limited to 'Lib/distutils/archive_util.py')
| -rw-r--r-- | Lib/distutils/archive_util.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Lib/distutils/archive_util.py b/Lib/distutils/archive_util.py index 834b722ed3..19a3bc4668 100644 --- a/Lib/distutils/archive_util.py +++ b/Lib/distutils/archive_util.py @@ -162,7 +162,15 @@ def make_zipfile(base_name, base_dir, verbose=0, dry_run=0): zip = zipfile.ZipFile(zip_filename, "w", compression=zipfile.ZIP_DEFLATED) + 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): |