Commit c605ad77 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki Committed by Xavier Thompson

Include slapos.libnetworkcache when upgrading buildout script.

parent 3d81eb00
......@@ -1099,8 +1099,15 @@ class Buildout(DictMixin):
if not self.newest:
return
distributions = ['zc.buildout', 'setuptools']
try:
import slapos.libnetworkcache
except ImportError:
pass
else:
distributions.append('slapos.libnetworkcache')
ws = zc.buildout.easy_install.install(
('zc.buildout', 'setuptools'),
distributions,
self['buildout']['eggs-directory'],
links = self['buildout'].get('find-links', '').split(),
index = self['buildout'].get('index'),
......@@ -1109,7 +1116,7 @@ class Buildout(DictMixin):
)
upgraded = []
for project in 'zc.buildout', 'setuptools':
for project in distributions:
req = pkg_resources.Requirement.parse(project)
project_location = pkg_resources.working_set.find(req).location
if ws.find(req).location != project_location:
......
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