[Python-checkins] python/dist/src/Lib/distutils/command install.py,1.63,1.64

[jhylton@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib/distutils/command
In directory usw-pr-cvs1:/tmp/cvs-serv27982

Modified Files:
	install.py 
Log Message:
Move warning about directory not on sys.path to debug level.

Fix a bunch of multiline string constants that used +.


Index: install.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/install.py,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** install.py	22 Mar 2002 15:35:17 -0000	1.63
--- install.py	4 Jun 2002 21:20:08 -0000	1.64
***************
*** 3,6 ****
--- 3,8 ----
  Implements the Distutils 'install' command."""
  
+ from distutils import log
+ 
  # created 1999/03/13, Greg Ward
  
***************
*** 369,374 ****
                  self.install_data is None):
                  raise DistutilsOptionError, \
!                       "install-base or install-platbase supplied, but " + \
!                       "installation scheme is incomplete"
              return
  
--- 371,376 ----
                  self.install_data is None):
                  raise DistutilsOptionError, \
!                       ("install-base or install-platbase supplied, but "
!                       "installation scheme is incomplete")
              return
  
***************
*** 465,470 ****
              else:
                  raise DistutilsOptionError, \
!                       "'extra_path' option must be a list, tuple, or " + \
!                       "comma-separated string with 1 or 2 elements"
  
              # convert to local form in case Unix notation used (as it
--- 467,472 ----
              else:
                  raise DistutilsOptionError, \
!                       ("'extra_path' option must be a list, tuple, or "
!                       "comma-separated string with 1 or 2 elements")
  
              # convert to local form in case Unix notation used (as it
***************
*** 523,530 ****
              not (self.path_file and self.install_path_file) and
              install_lib not in sys_path):
!             self.warn(("modules installed to '%s', which is not in " +
!                        "Python's module search path (sys.path) -- " +
!                        "you'll have to change the search path yourself") %
!                       self.install_lib)
  
      # run ()
--- 525,532 ----
              not (self.path_file and self.install_path_file) and
              install_lib not in sys_path):
!             log.debug(("modules installed to '%s', which is not in "
!                        "Python's module search path (sys.path) -- " 
!                        "you'll have to change the search path yourself"),
!                        self.install_lib)
  
      # run ()