mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-20 02:50:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merged revisions 75659 via svnmerge from

Browse source 
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
........
This commit is contained in:
Tarek Ziadé 2009-10-24 13:38:27 +00:00
parent c2e05ed8cb
commit 978cca6e27
3 changed files with 25 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Lib/distutils/archive_util.py
View file

@ -232,10 +232,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