commit 53fdb18b822395cae6e085f85ccc59f07a38dfd6
author Tarek Ziadé <ziade.tarek@gmail.com> Sat Oct 24 13:42:10 2009 +0000
committer Tarek Ziadé <ziade.tarek@gmail.com> Sat Oct 24 13:42:10 2009 +0000
tree 738e9df2ce820f9753d2df613a8bb4de3d2820bd
parent f6779fb1a4420775c1a32ac5ef396d061996be01

Merged revisions 75662 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r75662 | tarek.ziade | 2009-10-24 15:38:27 +0200 (Sat, 24 Oct 2009) | 9 lines

  Merged revisions 75659 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r75659 | tarek.ziade | 2009-10-24 15:29:44 +0200 (Sat, 24 Oct 2009) | 1 line

    #7066 - Fixed distutils.archive_util.make_archive behavior so it restores the cwd
  ........
................

Lib/distutils/archive_util.py

diff --git a/Lib/distutils/archive_util.py b/Lib/distutils/archive_util.py
index a568854..16164c7 100644
--- a/Lib/distutils/archive_util.py
+++ b/Lib/distutils/archive_util.py
@@ -171,10 +171,11 @@
     func = format_info[0]
     for arg, val in format_info[1]:
         kwargs[arg] = val
-    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