Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.buildout
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
slapos.buildout
Commits
66023b81
Commit
66023b81
authored
Jun 28, 2016
by
Kazuhiko Shiozaki
Committed by
Julien Muchembled
Oct 27, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix a bug where slapos.libnetworkcache is lost when buildout script is upgraded.
parent
44e5bc96
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
2 deletions
+10
-2
src/zc/buildout/buildout.py
src/zc/buildout/buildout.py
+10
-2
No files found.
src/zc/buildout/buildout.py
View file @
66023b81
...
@@ -1085,8 +1085,16 @@ class Buildout(DictMixin):
...
@@ -1085,8 +1085,16 @@ class Buildout(DictMixin):
if
not
self
.
newest
:
if
not
self
.
newest
:
return
return
distributions
=
[
'zc.buildout'
,
'setuptools'
]
try
:
import
slapos.libnetworkcache
except
ImportError
:
pass
else
:
distributions
.
append
(
'slapos.libnetworkcache'
)
ws
=
zc
.
buildout
.
easy_install
.
install
(
ws
=
zc
.
buildout
.
easy_install
.
install
(
(
'zc.buildout'
,
'setuptools'
)
,
distributions
,
self
[
'buildout'
][
'eggs-directory'
],
self
[
'buildout'
][
'eggs-directory'
],
links
=
self
[
'buildout'
].
get
(
'find-links'
,
''
).
split
(),
links
=
self
[
'buildout'
].
get
(
'find-links'
,
''
).
split
(),
index
=
self
[
'buildout'
].
get
(
'index'
),
index
=
self
[
'buildout'
].
get
(
'index'
),
...
@@ -1095,7 +1103,7 @@ class Buildout(DictMixin):
...
@@ -1095,7 +1103,7 @@ class Buildout(DictMixin):
)
)
upgraded
=
[]
upgraded
=
[]
for
project
in
'zc.buildout'
,
'setuptools'
:
for
project
in
distributions
:
req
=
pkg_resources
.
Requirement
.
parse
(
project
)
req
=
pkg_resources
.
Requirement
.
parse
(
project
)
project_location
=
pkg_resources
.
working_set
.
find
(
req
).
location
project_location
=
pkg_resources
.
working_set
.
find
(
req
).
location
if
ws
.
find
(
req
).
location
!=
project_location
:
if
ws
.
find
(
req
).
location
!=
project_location
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment