diff options
| author | Tarek Ziadé <ziade.tarek@gmail.com> | 2009-10-24 13:29:44 (GMT) |
|---|---|---|
| committer | Tarek Ziadé <ziade.tarek@gmail.com> | 2009-10-24 13:29:44 (GMT) |
| commit | 672422a328d0a4c9ce5528a64bdefd9a10474caf (patch) | |
| tree | 8ea4f94c6d1d70e31f95722255812ced69796f8b /Lib/distutils/archive_util.py | |
| parent | 1d6e2e1833864238b903325b37d05fef9b794393 (diff) | |
| download | cpython-672422a328d0a4c9ce5528a64bdefd9a10474caf.zip cpython-672422a328d0a4c9ce5528a64bdefd9a10474caf.tar.gz cpython-672422a328d0a4c9ce5528a64bdefd9a10474caf.tar.bz2 | |
#7066 - Fixed distutils.archive_util.make_archive behavior so it restores the cwd
Diffstat (limited to 'Lib/distutils/archive_util.py')
| -rw-r--r-- | Lib/distutils/archive_util.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Lib/distutils/archive_util.py b/Lib/distutils/archive_util.py index bc5edfd..c741cc0 100644 --- a/Lib/distutils/archive_util.py +++ b/Lib/distutils/archive_util.py @@ -233,9 +233,11 @@ def make_archive(base_name, format, root_dir=None, base_dir=None, verbose=0, kwargs['owner'] = owner kwargs['group'] = group - filename = func(base_name, base_dir, **kwargs) - if root_dir is not None: - log.debug("changing back to '%s'", save_cwd) - os.chdir(save_cwd) + try: + filename = func(base_name, base_dir, **kwargs) + finally: + if root_dir is not None: + log.debug("changing back to '%s'", save_cwd) + os.chdir(save_cwd) return filename |