Commit 52dcfcca authored by Jim Fulton's avatar Jim Fulton

Semi-experimental backward-compatibility change.

Maybe we can work with older versions of the egg recipe and other
recipes that biuild on it, making rollout of buildout 2 a bit simpler.
parent 2ef8941a
...@@ -727,8 +727,14 @@ def install(specs, dest, ...@@ -727,8 +727,14 @@ def install(specs, dest,
executable=sys.executable, executable=sys.executable,
always_unzip=None, # Backward compat :/ always_unzip=None, # Backward compat :/
path=None, working_set=None, newest=True, versions=None, path=None, working_set=None, newest=True, versions=None,
use_dependency_links=None, allow_hosts=('*',)): use_dependency_links=None, allow_hosts=('*',),
include_site_packages=None,
allowed_eggs_from_site_packages=None,
):
assert executable == sys.executable, (executable, sys.executable) assert executable == sys.executable, (executable, sys.executable)
assert include_site_packages is None
assert allowed_eggs_from_site_packages is None
installer = Installer(dest, links, index, sys.executable, installer = Installer(dest, links, index, sys.executable,
always_unzip, path, always_unzip, path,
newest, versions, use_dependency_links, newest, versions, use_dependency_links,
...@@ -831,12 +837,17 @@ def develop(setup, dest, ...@@ -831,12 +837,17 @@ def develop(setup, dest,
[f() for f in undo] [f() for f in undo]
def working_set(specs, executable, path=None): def working_set(specs, executable, path=None,
include_site_packages=None,
allowed_eggs_from_site_packages=None):
# Backward compat: # Backward compat:
if path is None: if path is None:
path = executable path = executable
else: else:
assert executable == sys.executable, (executable, sys.executable) assert executable == sys.executable, (executable, sys.executable)
assert include_site_packages is None
assert allowed_eggs_from_site_packages is None
return install(specs, None, path=path) return install(specs, None, path=path)
def scripts(reqs, working_set, executable, dest=None, def scripts(reqs, working_set, executable, dest=None,
......
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