Commit f463911f authored by Gary Poster's avatar Gary Poster

remove some superfluous whitespace, capitalize a comment, and normalize option...

remove some superfluous whitespace, capitalize a comment, and normalize option error message to look like the ones in zc.buildout.
parent 885134ca
...@@ -42,7 +42,7 @@ class Eggs(object): ...@@ -42,7 +42,7 @@ class Eggs(object):
allow_hosts = buildout['buildout'].get('allow-hosts', '*') allow_hosts = buildout['buildout'].get('allow-hosts', '*')
allow_hosts = tuple([host.strip() for host in allow_hosts.split('\n') allow_hosts = tuple([host.strip() for host in allow_hosts.split('\n')
if host.strip()!='']) if host.strip()!=''])
self.allow_hosts = allow_hosts self.allow_hosts = allow_hosts
options['eggs-directory'] = buildout['buildout']['eggs-directory'] options['eggs-directory'] = buildout['buildout']['eggs-directory']
options['_e'] = options['eggs-directory'] # backward compat. options['_e'] = options['eggs-directory'] # backward compat.
...@@ -81,9 +81,9 @@ class Eggs(object): ...@@ -81,9 +81,9 @@ class Eggs(object):
ws = zc.buildout.easy_install.install( ws = zc.buildout.easy_install.install(
distributions, options['eggs-directory'], distributions, options['eggs-directory'],
links = self.links, links=self.links,
index = self.index, index=self.index,
executable = options['executable'], executable=options['executable'],
path=[options['develop-eggs-directory']], path=[options['develop-eggs-directory']],
newest=self.buildout['buildout'].get('newest') == 'true', newest=self.buildout['buildout'].get('newest') == 'true',
allow_hosts=self.allow_hosts, allow_hosts=self.allow_hosts,
...@@ -115,7 +115,7 @@ class Scripts(Eggs): ...@@ -115,7 +115,7 @@ class Scripts(Eggs):
relative_paths = options.get( relative_paths = options.get(
'relative-paths', 'relative-paths',
buildout['buildout'].get('relative-paths', 'false') buildout['buildout'].get('relative-paths', 'false')
) )
if relative_paths == 'true': if relative_paths == 'true':
...@@ -150,7 +150,7 @@ class Scripts(Eggs): ...@@ -150,7 +150,7 @@ class Scripts(Eggs):
reqs.append(parsed.groups()) reqs.append(parsed.groups())
if get_bool(options, 'dependent-scripts'): if get_bool(options, 'dependent-scripts'):
# generate scripts for all packages in the working set, # Generate scripts for all packages in the working set,
# except setuptools. # except setuptools.
reqs = list(reqs) reqs = list(reqs)
for dist in ws: for dist in ws:
...@@ -183,6 +183,6 @@ def get_bool(options, name, default=False): ...@@ -183,6 +183,6 @@ def get_bool(options, name, default=False):
return False return False
else: else:
raise zc.buildout.UserError( raise zc.buildout.UserError(
"Invalid value for %s: %s" % (name, value)) "Invalid value for %s option: %s" % (name, value))
Egg = Scripts Egg = Scripts
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