Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 05:31:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Andrew Kuchling: changed so the '_path_created' dictionary is keyed on

Browse source 
absolute pathnames; this lets it keep working in the face of chdir'ing
around.
This commit is contained in:
Greg Ward 2000-09-30 17:47:17 +00:00
parent 3e6d43801b
commit 963cd2d85d
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Lib/distutils/dir_util.py
View file

@ -44,7 +44,7 @@ def mkpath (name, mode=0777, verbose=0, dry_run=0):
created_dirs = [] created_dirs = []
if os.path.isdir(name) or name == '': if os.path.isdir(name) or name == '':
return created_dirs return created_dirs
if _path_created.get(name): if _path_created.get(os.path.abspath(name)):
return created_dirs return created_dirs
(head, tail) = os.path.split(name) (head, tail) = os.path.split(name)
@ -64,7 +64,9 @@ def mkpath (name, mode=0777, verbose=0, dry_run=0):
for d in tails: for d in tails:
#print "head = %s, d = %s: " % (head, d), #print "head = %s, d = %s: " % (head, d),
head = os.path.join(head, d) head = os.path.join(head, d)
if _path_created.get(head): abs_head = os.path.abspath(head)
if _path_created.get(abs_head):
continue continue
if verbose: if verbose:
@ -78,7 +80,7 @@ def mkpath (name, mode=0777, verbose=0, dry_run=0):
raise DistutilsFileError, \ raise DistutilsFileError, \
"could not create '%s': %s" % (head, exc[-1]) "could not create '%s': %s" % (head, exc[-1])
_path_created[head] = 1 _path_created[abs_head] = 1
return created_dirs return created_dirs
# mkpath () # mkpath ()
@ -208,8 +210,9 @@ def remove_tree (directory, verbose=0, dry_run=0):
try: try:
apply(cmd[0], (cmd[1],)) apply(cmd[0], (cmd[1],))
# remove dir from cache if it's already there # remove dir from cache if it's already there
if _path_created.has_key(cmd[1]): abspath = os.path.abspath(cmd[1])
del _path_created[cmd[1]] if _path_created.has_key(abspath):
del _path_created[abspath]
except (IOError, OSError), exc: except (IOError, OSError), exc:
if verbose: if verbose:
print grok_environment_error( print grok_environment_error(