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
........
................
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
diff --git a/Lib/distutils/tests/test_archive_util.py b/Lib/distutils/tests/test_archive_util.py
index d88e0b3..c6e08cb 100644
--- a/Lib/distutils/tests/test_archive_util.py
+++ b/Lib/distutils/tests/test_archive_util.py
@@ -8,7 +8,8 @@
import warnings
from distutils.archive_util import (check_archive_formats, make_tarball,
- make_zipfile, make_archive)
+ make_zipfile, make_archive,
+ ARCHIVE_FORMATS)
from distutils.spawn import find_executable, spawn
from distutils.tests import support
from test.support import check_warnings
@@ -192,6 +193,20 @@
base_name = os.path.join(tmpdir, 'archive')
self.assertRaises(ValueError, make_archive, base_name, 'xxx')
+ def test_make_archive_cwd(self):
+ current_dir = os.getcwd()
+ def _breaks(*args, **kw):
+ raise RuntimeError()
+ ARCHIVE_FORMATS['xxx'] = (_breaks, [], 'xxx file')
+ try:
+ try:
+ make_archive('xxx', 'xxx', root_dir=self.mkdtemp())
+ except:
+ pass
+ self.assertEquals(os.getcwd(), current_dir)
+ finally:
+ del ARCHIVE_FORMATS['xxx']
+
def test_suite():
return unittest.makeSuite(ArchiveUtilTestCase)
diff --git a/Misc/NEWS b/Misc/NEWS
index 8f22d9a..e6d09c6 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1069,6 +1069,9 @@
Library
-------
+- Issue #7066: archive_util.make_archive now restores the cwd if an error is
+ raised. Initial patch by Ezio Melotti.
+
- Issue #6545: Removed assert statements in distutils.Extension, so the
behavior is similar when used with -O.