summaryrefslogtreecommitdiff
path: root/Lib/distutils/archive_util.py
diff options
context:
space:
mode:
Diffstat (limited to 'Lib/distutils/archive_util.py')
-rw-r--r--Lib/distutils/archive_util.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/Lib/distutils/archive_util.py b/Lib/distutils/archive_util.py
index 264e66faf2..251c0df4e9 100644
--- a/Lib/distutils/archive_util.py
+++ b/Lib/distutils/archive_util.py
@@ -162,9 +162,12 @@ def make_archive (base_name, format,
kwargs[arg] = val
filename = apply(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