Commit 893a3b57 authored by PJ Eby's avatar PJ Eby

Don't make things warnings that aren't; update info text for

--multi-version.  (backport from trunk)

--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4046390
parent 5dc9f89d
...@@ -496,7 +496,7 @@ Please make the appropriate changes for your system and try again. ...@@ -496,7 +496,7 @@ Please make the appropriate changes for your system and try again.
self.local_index.add(dist) self.local_index.add(dist)
self.install_egg_scripts(dist) self.install_egg_scripts(dist)
self.installed_projects[dist.key] = dist self.installed_projects[dist.key] = dist
log.warn(self.installation_report(requirement, dist, *info)) log.info(self.installation_report(requirement, dist, *info))
if not deps and not self.always_copy: if not deps and not self.always_copy:
return return
elif requirement is not None and dist.key != requirement.key: elif requirement is not None and dist.key != requirement.key:
...@@ -649,7 +649,7 @@ Please make the appropriate changes for your system and try again. ...@@ -649,7 +649,7 @@ Please make the appropriate changes for your system and try again.
# Now run it, and return the result # Now run it, and return the result
if self.editable: if self.editable:
log.warn(self.report_editable(spec, setup_script)) log.info(self.report_editable(spec, setup_script))
return [] return []
else: else:
return self.build_and_install(setup_script, setup_base) return self.build_and_install(setup_script, setup_base)
...@@ -865,10 +865,10 @@ you ignore the conflicts, the installed package(s) may not work. ...@@ -865,10 +865,10 @@ you ignore the conflicts, the installed package(s) may not work.
if self.multi_version and not self.no_report: if self.multi_version and not self.no_report:
msg += """ msg += """
Because this distribution was installed --multi-version or --install-dir, Because this distribution was installed --multi-version, before you can
before you can import modules from this package in an application, you import modules from this package in an application, you will need to
will need to 'import pkg_resources' and then use a 'require()' call 'import pkg_resources' and then use a 'require()' call similar to one of
similar to one of these examples, in order to select the desired version: these examples, in order to select the desired version:
pkg_resources.require("%(name)s") # latest installed version pkg_resources.require("%(name)s") # latest installed version
pkg_resources.require("%(name)s==%(version)s") # this exact version pkg_resources.require("%(name)s==%(version)s") # this exact version
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment