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

Merged revisions 69332 via svnmerge from

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

........
  r69332 | tarek.ziade | 2009-02-06 01:49:45 +0100 (Fri, 06 Feb 2009) | 1 line

  using >= so setting verbose to 2 will work as well
........
This commit is contained in:
Tarek Ziadé 2009-02-06 00:53:43 +00:00
parent a045937b45
commit 35e6fd5de9
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/distutils/dir_util.py
View file

@ -62,7 +62,7 @@ def mkpath (name, mode=0o777, verbose=1, dry_run=0):
if _path_created.get(abs_head):
continue
if verbose == 1:
if verbose >= 1:
log.info("creating %s", head)
if not dry_run:
@ -153,7 +153,7 @@ def copy_tree (src, dst,
if preserve_symlinks and os.path.islink(src_name):
link_dest = os.readlink(src_name)
if verbose == 1:
if verbose >= 1:
log.info("linking %s -> %s", dst_name, link_dest)
if not dry_run:
os.symlink(link_dest, dst_name)
@ -190,7 +190,7 @@ def remove_tree (directory, verbose=1, dry_run=0):
from distutils.util import grok_environment_error
global _path_created
if verbose == 1:
if verbose >= 1:
log.info("removing '%s' (and everything under it)", directory)
if dry_run:
return

6
Lib/distutils/file_util.py
View file

@ -112,7 +112,7 @@ def copy_file(src, dst, preserve_mode=1, preserve_times=1, update=0,
dir = os.path.dirname(dst)
if update and not newer(src, dst):
if verbose == 1:
if verbose >= 1:
log.debug("not copying %s (output up-to-date)", src)
return (dst, 0)
@ -121,7 +121,7 @@ def copy_file(src, dst, preserve_mode=1, preserve_times=1, update=0,
except KeyError:
raise ValueError("invalid value '%s' for 'link' argument" % link)
if verbose == 1:
if verbose >= 1:
if os.path.basename(dst) == os.path.basename(src):
log.info("%s %s -> %s", action, src, dir)
else:
@ -180,7 +180,7 @@ def move_file (src, dst,
from os.path import exists, isfile, isdir, basename, dirname
import errno
if verbose == 1:
if verbose >= 1:
log.info("moving %s -> %s", src, dst)
if dry_run: