Merge branch 'bug_766891' into fork

bootstrap/bootstrap.py

@@ -116,6 +116,12 @@ parser.add_option("--download-base", action="callback", dest="download_base",
                   help=("Specify a URL or directory for downloading "
                         "zc.buildout and either Setuptools or Distribute. "
                         "Defaults to PyPI."))
+parser.add_option("--buildout-download-base", action="callback",
+                  dest="buildout_download_base", callback=normalize_to_url,
+                  nargs=1, type="string",
+                  help=("Specify a URL or directory for downloading "
+                        "zc.buildout. "
+                        "Defaults to PyPI or download_base."))
 parser.add_option("--eggs",
                   help=("Specify a directory for storing eggs.  Defaults to "
                         "a temporary directory that is deleted when the "
@@ -188,7 +194,7 @@ cmd = [quote(sys.executable),
 if not has_broken_dash_S:
     cmd.insert(1, '-S')
 
-find_links = options.download_base
+find_links = options.buildout_download_base or options.download_base
 if not find_links:
     find_links = os.environ.get('bootstrap-testing-find-links')
 if find_links: