mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2025-01-18 18:56:28 +00:00
ez_setup.py: put back the warning about downloading, but only if the URL that you are using is not "file:"
This commit is contained in:
parent
67a3b5f79d
commit
ea44b8b56a
20
ez_setup.py
20
ez_setup.py
@ -96,7 +96,25 @@ def download_setuptools(
|
|||||||
if not os.path.exists(saveto): # Avoid repeated downloads
|
if not os.path.exists(saveto): # Avoid repeated downloads
|
||||||
try:
|
try:
|
||||||
from distutils import log
|
from distutils import log
|
||||||
log.warn("Downloading %s", url)
|
if download_base.startswith("file:"):
|
||||||
|
log.warn("Unpacking %s", url)
|
||||||
|
else:
|
||||||
|
log.warn("""
|
||||||
|
---------------------------------------------------------------------------
|
||||||
|
This script requires setuptools version %s to run (even to display
|
||||||
|
help). I will attempt to download it for you (from
|
||||||
|
%s), but
|
||||||
|
you may need to enable firewall access for this script first.
|
||||||
|
|
||||||
|
(Note: if this machine does not have network access, please obtain the file
|
||||||
|
|
||||||
|
%s
|
||||||
|
|
||||||
|
and place it in this directory before rerunning this script.)
|
||||||
|
---------------------------------------------------------------------------""",
|
||||||
|
version, download_base, url
|
||||||
|
);
|
||||||
|
log.warn("Downloading %s", url)
|
||||||
src = urllib2.urlopen(url)
|
src = urllib2.urlopen(url)
|
||||||
# Read/write all in one block, so we don't create a corrupt file
|
# Read/write all in one block, so we don't create a corrupt file
|
||||||
# if the download is interrupted.
|
# if the download is interrupted.
|
||||||
|
Loading…
Reference in New Issue
Block a user