[Python-checkins] CVS: distutils/distutils/command install.py,1.34,1.35

Greg Ward python-dev@python.org
Sun, 28 May 2000 16:47:34 -0700


Update of /cvsroot/python/distutils/distutils/command
In directory slayer.i.sourceforge.net:/tmp/cvs-serv10251

Modified Files:
	install.py 
Log Message:
Only print debugging output if DEBUG (imported from distutils.core) is true.

Index: install.py
===================================================================
RCS file: /cvsroot/python/distutils/distutils/command/install.py,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** install.py	2000/05/27 17:27:23	1.34
--- install.py	2000/05/28 23:47:31	1.35
***************
*** 5,13 ****
  # created 1999/03/13, Greg Ward
  
! __revision__ = "$Id: install.py,v 1.34 2000/05/27 17:27:23 gward Exp $"
  
  import sys, os, string
  from types import *
! from distutils.core import Command
  from distutils import sysconfig
  from distutils.util import write_file, native_path, subst_vars, change_root
--- 5,13 ----
  # created 1999/03/13, Greg Ward
  
! __revision__ = "$Id: install.py,v 1.35 2000/05/28 23:47:31 gward Exp $"
  
  import sys, os, string
  from types import *
! from distutils.core import Command, DEBUG
  from distutils import sysconfig
  from distutils.util import write_file, native_path, subst_vars, change_root
***************
*** 241,247 ****
          self.config_vars['platbase'] = self.install_platbase
  
!         from pprint import pprint
!         print "config vars:"
!         pprint (self.config_vars)
  
          # Expand "~" and configuration variables in the installation
--- 241,248 ----
          self.config_vars['platbase'] = self.install_platbase
  
!         if DEBUG:
!             from pprint import pprint
!             print "config vars:"
!             pprint (self.config_vars)
  
          # Expand "~" and configuration variables in the installation
***************
*** 290,304 ****
  
  
-     # hack for debugging output
      def dump_dirs (self, msg):
!         from distutils.fancy_getopt import longopt_xlate
!         print msg + ":"
!         for opt in self.user_options:
!             opt_name = opt[0]
!             if opt_name[-1] == "=":
!                 opt_name = opt_name[0:-1]
!             opt_name = string.translate (opt_name, longopt_xlate)
!             val = getattr (self, opt_name)
!             print "  %s: %s" % (opt_name, val)
  
  
--- 291,305 ----
  
  
      def dump_dirs (self, msg):
!         if DEBUG:
!             from distutils.fancy_getopt import longopt_xlate
!             print msg + ":"
!             for opt in self.user_options:
!                 opt_name = opt[0]
!                 if opt_name[-1] == "=":
!                     opt_name = opt_name[0:-1]
!                 opt_name = string.translate (opt_name, longopt_xlate)
!                 val = getattr (self, opt_name)
!                 print "  %s: %s" % (opt_name, val)