Commit f08b0238 authored by Jim Fulton's avatar Jim Fulton

When bootstrapping with a buildout that has develop eggs for buildout

or setuptools, copy the develop eggs to the new buildout's
develop-eggs directory, rather than its eggs directory.
parent 99d1320a
...@@ -219,7 +219,7 @@ class Buildout(dict): ...@@ -219,7 +219,7 @@ class Buildout(dict):
r = pkg_resources.Requirement.parse(name) r = pkg_resources.Requirement.parse(name)
dist = pkg_resources.working_set.find(r) dist = pkg_resources.working_set.find(r)
if dist.precedence == pkg_resources.DEVELOP_DIST: if dist.precedence == pkg_resources.DEVELOP_DIST:
dest = os.path.join(self['buildout']['eggs-directory'], dest = os.path.join(self['buildout']['develop-eggs-directory'],
name+'.egg-link') name+'.egg-link')
open(dest, 'w').write(dist.location) open(dest, 'w').write(dist.location)
entries.append(dist.location) entries.append(dist.location)
......
...@@ -1305,10 +1305,16 @@ Note that a basic setup.cfg was created for us. ...@@ -1305,10 +1305,16 @@ Note that a basic setup.cfg was created for us.
>>> ls(sample_bootstrapped, 'bin') >>> ls(sample_bootstrapped, 'bin')
- buildout - buildout
>>> ls(sample_bootstrapped, 'eggs') >>> _ = (ls(sample_bootstrapped, 'eggs'),
... ls(sample_bootstrapped, 'develop-eggs'))
- setuptools-0.6-py2.3.egg - setuptools-0.6-py2.3.egg
- zc.buildout-1.0-py2.3.egg - zc.buildout-1.0-py2.3.egg
(We list both the eggs and develop-eggs diectories because the
buildout or setuptools egg could be installed in the develop-eggs
directory if the original buildout had develop eggs for either
buildout or setuptools.)
Note that the buildout script was installed but not run. To run Note that the buildout script was installed but not run. To run
the buildout, we'd have to run the installed buildout script. the buildout, we'd have to run the installed buildout script.
......
...@@ -170,8 +170,16 @@ def buildoutSetUp(test): ...@@ -170,8 +170,16 @@ def buildoutSetUp(test):
# Use the buildout bootstrap command to create a buildout # Use the buildout bootstrap command to create a buildout
zc.buildout.buildout.Buildout( zc.buildout.buildout.Buildout(
os.path.join(sample, 'buildout.cfg'), os.path.join(sample, 'buildout.cfg'),
[('buildout', 'log-level', 'WARNING')] [('buildout', 'log-level', 'WARNING'),
# trick bootstrap into putting the buildout develop egg
# in the eggs dir.
('buildout', 'develop-eggs-directory', 'eggs'),
]
).bootstrap([]) ).bootstrap([])
# Create the develop-eggs dir, which didn't get created the usual
# way due to thr trick above:
os.mkdir(os.path.join(sample, 'develop-eggs'))
def start_server(path): def start_server(path):
port, thread = _start_server(path, name=path) port, thread = _start_server(path, name=path)
......
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