Commit 792deebc authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

Release buildout-1.7.1.post9.

Merge branch 'always_use_build'
parents 76dc1b0b 83fc3a2d
1.7.1.post9
-----------
- Always use build() in easy_install.py to install eggs.
1.7.1.post8 1.7.1.post8
----------- -----------
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
# #
############################################################################## ##############################################################################
name = "zc.buildout" name = "zc.buildout"
version = "1.7.1.post8" version = "1.7.1.post9"
import os import os
from setuptools import setup from setuptools import setup
......
...@@ -1049,6 +1049,8 @@ class Installer: ...@@ -1049,6 +1049,8 @@ class Installer:
pkg_resources.Requirement.parse('setuptools') pkg_resources.Requirement.parse('setuptools')
) )
if ws.find(requirement) is None: if ws.find(requirement) is None:
self._env.scan(
self.build(str(requirement), {}))
for dist in self._get_dist(requirement, ws, False): for dist in self._get_dist(requirement, ws, False):
ws.add(dist) ws.add(dist)
...@@ -1129,6 +1131,8 @@ class Installer: ...@@ -1129,6 +1131,8 @@ class Installer:
else: else:
logger.debug('Adding required %r', str(req)) logger.debug('Adding required %r', str(req))
_log_requirement(ws, req) _log_requirement(ws, req)
self._env.scan(
self.build(str(req), {}))
for dist in self._get_dist(req, for dist in self._get_dist(req,
ws, self._always_unzip): ws, self._always_unzip):
ws.add(dist) ws.add(dist)
......
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