From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Fri, 14 Sep 2007 03:14:51 +0000 (-0700)
Subject: ez_setup.py: put back the warning about downloading, but only if the URL that you... 
X-Git-Tag: allmydata-tahoe-0.6.0~124
X-Git-Url: https://git.rkrishnan.org/somewhere?a=commitdiff_plain;h=ea44b8b56a8f55d47acc7d0f53c2870b0672f6f6;p=tahoe-lafs%2Ftahoe-lafs.git

ez_setup.py: put back the warning about downloading, but only if the URL that you are using is not "file:"
---

diff --git a/ez_setup.py b/ez_setup.py
index 4c1b6978..48dc2983 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -96,7 +96,25 @@ def download_setuptools(
     if not os.path.exists(saveto):  # Avoid repeated downloads
         try:
             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)
             # Read/write all in one block, so we don't create a corrupt file
             # if the download is interrupted.