Commit 7c5be5b7 authored by Łukasz Nowak's avatar Łukasz Nowak

Revert "Use slapos.buildout patched bootstrap."

This reverts commit 4ac582c4.

This reverts commit f2be5210.

The idea *was* to not force providing external buildout. But then slapgrid
would have to get all not known dependencies, so it will be less usable.

Drop this way.
parent 245d59c9
...@@ -79,8 +79,7 @@ def normalize_to_url(option, opt_str, value, parser): ...@@ -79,8 +79,7 @@ def normalize_to_url(option, opt_str, value, parser):
value = 'file://%s' % ( value = 'file://%s' % (
urllib.pathname2url( urllib.pathname2url(
os.path.abspath(os.path.expanduser(value))),) os.path.abspath(os.path.expanduser(value))),)
if opt_str in ['--download-base', '--buildout-download-base'] \ if opt_str == '--download-base' and not value.endswith('/'):
and not value.endswith('/'):
# Download base needs a trailing slash to make the world happy. # Download base needs a trailing slash to make the world happy.
value += '/' value += '/'
else: else:
...@@ -117,12 +116,6 @@ parser.add_option("--download-base", action="callback", dest="download_base", ...@@ -117,12 +116,6 @@ parser.add_option("--download-base", action="callback", dest="download_base",
help=("Specify a URL or directory for downloading " help=("Specify a URL or directory for downloading "
"zc.buildout and either Setuptools or Distribute. " "zc.buildout and either Setuptools or Distribute. "
"Defaults to PyPI.")) "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", parser.add_option("--eggs",
help=("Specify a directory for storing eggs. Defaults to " help=("Specify a directory for storing eggs. Defaults to "
"a temporary directory that is deleted when the " "a temporary directory that is deleted when the "
...@@ -195,7 +188,7 @@ cmd = [quote(sys.executable), ...@@ -195,7 +188,7 @@ cmd = [quote(sys.executable),
if not has_broken_dash_S: if not has_broken_dash_S:
cmd.insert(1, '-S') cmd.insert(1, '-S')
find_links = options.buildout_download_base or options.download_base find_links = options.download_base
if not find_links: if not find_links:
find_links = os.environ.get('bootstrap-testing-find-links') find_links = os.environ.get('bootstrap-testing-find-links')
if find_links: if find_links:
......
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