Commit 0b58d50e authored by jim's avatar jim

Refactored to not pass an always_unzip option to

zc.buildout.easy_install.install if the user didn't use an unzip
option. This is to allow defaults set at the buildout level to be honored.


git-svn-id: http://svn.zope.org/repos/main/zc.buildout/trunk@88548 62d5b8a3-27da-0310-9561-8e5933582275
parent 089bc24f
...@@ -75,16 +75,23 @@ class Eggs(object): ...@@ -75,16 +75,23 @@ class Eggs(object):
[options['develop-eggs-directory'], options['eggs-directory']] [options['develop-eggs-directory'], options['eggs-directory']]
) )
else: else:
kw = {}
always_unzip = options.get('unzip')
if always_unzip is not None:
if always_unzip not in ('true', 'false'):
raise zc.buildout.UserError("Invalid value for unzip, %s"
% always_unzip)
kw['always_unzip'] = always_unzip == 'true'
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'],
always_unzip=options.get('unzip') == 'true',
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,
) **kw)
return orig_distributions, ws return orig_distributions, ws
......
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