diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2013-08-25 21:22:34 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2013-08-25 21:22:34 -0400 |
| commit | 4041d1f4667aa4bd7f7373ff7cc626b0d9f5d10c (patch) | |
| tree | 3ffc46fff773f7dde75d8a0c5daa421ddea517b4 | |
| parent | 2ec8add337856baa2fba48b161ef380d5d007a02 (diff) | |
| download | external_python_setuptools-4041d1f4667aa4bd7f7373ff7cc626b0d9f5d10c.tar.gz external_python_setuptools-4041d1f4667aa4bd7f7373ff7cc626b0d9f5d10c.tar.bz2 external_python_setuptools-4041d1f4667aa4bd7f7373ff7cc626b0d9f5d10c.zip | |
Updated error message reported when `--allow-hosts` blocks a link to provide a less startling user experience. Fixes #71.
| -rw-r--r-- | CHANGES.txt | 7 | ||||
| -rwxr-xr-x | setuptools/package_index.py | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 9f1d15b3..b95b7102 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -3,6 +3,13 @@ CHANGES ======= --- +1.1 +--- + +* Issue #71 (Distribute Issue #333): EasyInstall now puts less emphasis on the + condition when a host is blocked via ``--allow-hosts``. + +--- 1.0 --- diff --git a/setuptools/package_index.py b/setuptools/package_index.py index 9c9d76a1..d949063e 100755 --- a/setuptools/package_index.py +++ b/setuptools/package_index.py @@ -343,7 +343,8 @@ class PackageIndex(Environment): s = URL_SCHEME(url) if (s and s.group(1).lower()=='file') or self.allows(urlparse(url)[1]): return True - msg = "\nLink to % s ***BLOCKED*** by --allow-hosts\n" + msg = ("\nNote: Bypassing %s (disallowed host; see " + "http://bit.ly/1dg9ijs for details).\n") if fatal: raise DistutilsError(msg % url) else: |