mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-22 09:45:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Merged revisions 75659 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

Only the try/except was backported; owner and group were added in 2.7,
as was the test file.

........
  r75659 | tarek.ziade | 2009-10-24 09:29:44 -0400 (Sat, 24 Oct 2009) | 1 line

  #7066 - Fixed distutils.archive_util.make_archive behavior so it restores the cwd
........
This commit is contained in:
R. David Murray 2010-08-01 01:53:52 +00:00
parent 1d978df33f
commit 2b112a6bb3
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Lib/distutils/archive_util.py
View file

@ -162,9 +162,12 @@ def make_archive (base_name, format,
kwargs[arg] = val kwargs[arg] = val
filename = apply(func, (base_name, base_dir), kwargs) filename = apply(func, (base_name, base_dir), kwargs)
if root_dir is not None: try:
log.debug("changing back to '%s'", save_cwd) filename = func(base_name, base_dir, **kwargs)
os.chdir(save_cwd) finally:
if root_dir is not None:
log.debug("changing back to '%s'", save_cwd)
os.chdir(save_cwd)
return filename return filename

3
Misc/NEWS
View file

@ -84,6 +84,9 @@ C-API
Library Library
------- -------
- Issue #7066: archive_util.make_archive now restores the cwd if an error is
raised. Initial patch by Ezio Melotti.
- Issue #5006: Better handling of unicode byte-order marks (BOM) in the io - Issue #5006: Better handling of unicode byte-order marks (BOM) in the io
library. This means, for example, that opening an UTF-16 text file in append library. This means, for example, that opening an UTF-16 text file in append
mode doesn't add a BOM at the end of the file if the file isn't empty. mode doesn't add a BOM at the end of the file if the file isn't empty.