Changed 'remove_tree()' to use the new 'grok_environment_error()' function

instead of muddling through IOError and OSError exception objects itself.
This commit is contained in:
Greg Ward 2000-06-17 02:18:19 +00:00
parent cf0e2dde6d
commit fcd4f87397
1 changed files with 6 additions and 7 deletions

View File

@ -193,9 +193,11 @@ def _build_cmdtuple(path, cmdtuples):
def remove_tree (directory, verbose=0, dry_run=0):
"""Recursively remove an entire directory tree. Any errors are ignored
(apart from being reported to stdout if 'verbose' is true)."""
(apart from being reported to stdout if 'verbose' is true).
"""
from distutils.util import grok_environment_error
global PATH_CREATED
if verbose:
print "removing '%s' (and everything under it)" % directory
if dry_run:
@ -210,8 +212,5 @@ def remove_tree (directory, verbose=0, dry_run=0):
del PATH_CREATED[cmd[1]]
except (IOError, OSError), exc:
if verbose:
if exc.filename:
print "error removing %s: %s (%s)" % \
(directory, exc.strerror, exc.filename)
else:
print "error removing %s: %s" % (directory, exc.strerror)
print grok_environment_error(
exc, "error removing %s: " % directory)