From: Tarek Ziadé Date: Sat, 24 Oct 2009 13:29:44 +0000 (+0000) Subject: #7066 - Fixed distutils.archive_util.make_archive behavior so it restores the cwd X-Git-Tag: v2.7a1~256 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=672422a328d0a4c9ce5528a64bdefd9a10474caf;p=python #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 bc5edfd864..c741cc0174 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 diff --git a/Lib/distutils/tests/test_archive_util.py b/Lib/distutils/tests/test_archive_util.py index b91986ba95..a9b46d8e22 100644 --- a/Lib/distutils/tests/test_archive_util.py +++ b/Lib/distutils/tests/test_archive_util.py @@ -8,7 +8,8 @@ from os.path import splitdrive 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.test_support import check_warnings @@ -262,6 +263,20 @@ class ArchiveUtilTestCase(support.TempdirManager, finally: archive.close() + 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 7f3825914f..052ec4843d 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -418,6 +418,9 @@ Core and Builtins Library ------- +- Issue #7066: archive_util.make_archive now restores the cwd if an error is + raised. Initial patch by Ezio Melotti. + - Issue #6218: io.StringIO and io.BytesIO instances are now picklable with protocol 2.