[Python-checkins] r69336 - in python/branches/py3k: Lib/distutils/dir_util.py Lib/distutils/file_util.py

[tarek.ziade]

Author: tarek.ziade
Date: Fri Feb  6 01:53:43 2009
New Revision: 69336

Log:
Merged revisions 69332 via svnmerge from 
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
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/distutils/dir_util.py
   python/branches/py3k/Lib/distutils/file_util.py

Modified: python/branches/py3k/Lib/distutils/dir_util.py
==============================================================================
--- python/branches/py3k/Lib/distutils/dir_util.py	(original)
+++ python/branches/py3k/Lib/distutils/dir_util.py	Fri Feb  6 01:53:43 2009
@@ -62,7 +62,7 @@
         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 @@
 
         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 @@
     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

Modified: python/branches/py3k/Lib/distutils/file_util.py
==============================================================================
--- python/branches/py3k/Lib/distutils/file_util.py	(original)
+++ python/branches/py3k/Lib/distutils/file_util.py	Fri Feb  6 01:53:43 2009
@@ -112,7 +112,7 @@
         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 @@
     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 @@
     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: