Commit 03785ef0 authored by jim's avatar jim

Renamed several options to use -s rather than _s.


git-svn-id: http://svn.zope.org/repos/main/zc.buildout/trunk@68605 62d5b8a3-27da-0310-9561-8e5933582275
parent 60e586ae
...@@ -11,7 +11,7 @@ distribution ...@@ -11,7 +11,7 @@ distribution
If not specified, the distribution defaults to the part name. If not specified, the distribution defaults to the part name.
find_links find-links
A list of URLs, files, or directories to search for distributions. A list of URLs, files, or directories to search for distributions.
To illustrate this, we've created a directory with some sample eggs: To illustrate this, we've created a directory with some sample eggs:
...@@ -33,11 +33,11 @@ install the demo package. ...@@ -33,11 +33,11 @@ install the demo package.
... [demo] ... [demo]
... recipe = zc.recipe.egg ... recipe = zc.recipe.egg
... distribution = demo <0.3 ... distribution = demo <0.3
... find_links = %s ... find-links = %s
... """ % sample_eggs) ... """ % sample_eggs)
In this example, we limited ourself to revisions before 0.3. We also In this example, we limited ourself to revisions before 0.3. We also
specified where to find distributions using the find_links option. specified where to find distributions using the find-links option.
Let's run the buildout: Let's run the buildout:
...@@ -103,7 +103,7 @@ specification. For example, if we remove the restriction on demo: ...@@ -103,7 +103,7 @@ specification. For example, if we remove the restriction on demo:
... ...
... [demo] ... [demo]
... recipe = zc.recipe.egg ... recipe = zc.recipe.egg
... find_links = %s ... find-links = %s
... """ % sample_eggs) ... """ % sample_eggs)
and rerun the buildout: and rerun the buildout:
...@@ -138,7 +138,7 @@ arguments: ...@@ -138,7 +138,7 @@ arguments:
... ...
... [demo] ... [demo]
... recipe = zc.recipe.egg ... recipe = zc.recipe.egg
... find_links = %s ... find-links = %s
... scripts = ... scripts =
... """ % sample_eggs) ... """ % sample_eggs)
...@@ -158,7 +158,7 @@ You can also control the name used for scripts: ...@@ -158,7 +158,7 @@ You can also control the name used for scripts:
... ...
... [demo] ... [demo]
... recipe = zc.recipe.egg ... recipe = zc.recipe.egg
... find_links = %s ... find-links = %s
... scripts = demo=foo ... scripts = demo=foo
... """ % sample_eggs) ... """ % sample_eggs)
......
...@@ -29,8 +29,8 @@ class Egg: ...@@ -29,8 +29,8 @@ class Egg:
def install(self): def install(self):
distribution = self.options.get('distribution', self.name) distribution = self.options.get('distribution', self.name)
links = self.options.get( links = self.options.get(
'find_links', 'find-links',
self.buildout['buildout'].get('find_links'), self.buildout['buildout'].get('find-links'),
) )
if links: if links:
links = links.split() links = links.split()
......
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