mirror of
https://github.com/python/cpython.git
synced 2025-12-09 02:35:14 +00:00
Move warning about directory not on sys.path to debug level.
Fix a bunch of multiline string constants that used +.
This commit is contained in:
parent
8f787bf1d0
commit
dc8412e541
1 changed files with 10 additions and 8 deletions
|
|
@ -2,6 +2,8 @@
|
||||||
|
|
||||||
Implements the Distutils 'install' command."""
|
Implements the Distutils 'install' command."""
|
||||||
|
|
||||||
|
from distutils import log
|
||||||
|
|
||||||
# created 1999/03/13, Greg Ward
|
# created 1999/03/13, Greg Ward
|
||||||
|
|
||||||
__revision__ = "$Id$"
|
__revision__ = "$Id$"
|
||||||
|
|
@ -368,8 +370,8 @@ class install (Command):
|
||||||
self.install_scripts is None or
|
self.install_scripts is None or
|
||||||
self.install_data is None):
|
self.install_data is None):
|
||||||
raise DistutilsOptionError, \
|
raise DistutilsOptionError, \
|
||||||
"install-base or install-platbase supplied, but " + \
|
("install-base or install-platbase supplied, but "
|
||||||
"installation scheme is incomplete"
|
"installation scheme is incomplete")
|
||||||
return
|
return
|
||||||
|
|
||||||
if self.home is not None:
|
if self.home is not None:
|
||||||
|
|
@ -464,8 +466,8 @@ class install (Command):
|
||||||
(path_file, extra_dirs) = self.extra_path
|
(path_file, extra_dirs) = self.extra_path
|
||||||
else:
|
else:
|
||||||
raise DistutilsOptionError, \
|
raise DistutilsOptionError, \
|
||||||
"'extra_path' option must be a list, tuple, or " + \
|
("'extra_path' option must be a list, tuple, or "
|
||||||
"comma-separated string with 1 or 2 elements"
|
"comma-separated string with 1 or 2 elements")
|
||||||
|
|
||||||
# convert to local form in case Unix notation used (as it
|
# convert to local form in case Unix notation used (as it
|
||||||
# should be in setup scripts)
|
# should be in setup scripts)
|
||||||
|
|
@ -522,10 +524,10 @@ class install (Command):
|
||||||
if (self.warn_dir and
|
if (self.warn_dir and
|
||||||
not (self.path_file and self.install_path_file) and
|
not (self.path_file and self.install_path_file) and
|
||||||
install_lib not in sys_path):
|
install_lib not in sys_path):
|
||||||
self.warn(("modules installed to '%s', which is not in " +
|
log.debug(("modules installed to '%s', which is not in "
|
||||||
"Python's module search path (sys.path) -- " +
|
"Python's module search path (sys.path) -- "
|
||||||
"you'll have to change the search path yourself") %
|
"you'll have to change the search path yourself"),
|
||||||
self.install_lib)
|
self.install_lib)
|
||||||
|
|
||||||
# run ()
|
# run ()
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue