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
isaak yansane-sisk
slapos.buildout
Commits
5d5ebff6
Commit
5d5ebff6
authored
Jun 23, 2011
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Simplify detection of libnetworkcache.
parent
4a184955
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
10 deletions
+8
-10
src/zc/buildout/buildout.py
src/zc/buildout/buildout.py
+8
-10
No files found.
src/zc/buildout/buildout.py
View file @
5d5ebff6
...
@@ -40,6 +40,12 @@ import zc.buildout
...
@@ -40,6 +40,12 @@ import zc.buildout
import
zc.buildout.download
import
zc.buildout.download
import
zc.buildout.easy_install
import
zc.buildout.easy_install
try
:
import
slapos.libnetworkcache
except
ImportError
:
LIBNETWORKCACHE_ENABLED
=
False
else
:
LIBNETWORKCACHE_ENABLED
=
True
realpath
=
zc
.
buildout
.
easy_install
.
realpath
realpath
=
zc
.
buildout
.
easy_install
.
realpath
...
@@ -345,11 +351,7 @@ class Buildout(UserDict.DictMixin):
...
@@ -345,11 +351,7 @@ class Buildout(UserDict.DictMixin):
# Get a base working set for our distributions that corresponds to the
# Get a base working set for our distributions that corresponds to the
# stated desires in the configuration.
# stated desires in the configuration.
distributions
=
[
'setuptools'
,
'zc.buildout'
]
distributions
=
[
'setuptools'
,
'zc.buildout'
]
try
:
if
LIBNETWORKCACHE_ENABLED
:
import
slapos.libnetworkcache
except
ImportError
:
pass
else
:
distributions
.
append
(
'slapos.libnetworkcache'
)
distributions
.
append
(
'slapos.libnetworkcache'
)
if
options
.
get
(
'offline'
)
==
'true'
:
if
options
.
get
(
'offline'
)
==
'true'
:
ws
=
zc
.
buildout
.
easy_install
.
working_set
(
ws
=
zc
.
buildout
.
easy_install
.
working_set
(
...
@@ -375,11 +377,7 @@ class Buildout(UserDict.DictMixin):
...
@@ -375,11 +377,7 @@ class Buildout(UserDict.DictMixin):
# Now copy buildout and setuptools eggs, and record destination eggs:
# Now copy buildout and setuptools eggs, and record destination eggs:
entries
=
[]
entries
=
[]
copy_list
=
[
'setuptools'
,
'zc.buildout'
]
copy_list
=
[
'setuptools'
,
'zc.buildout'
]
try
:
if
LIBNETWORKCACHE_ENABLED
:
import
slapos.libnetworkcache
except
ImportError
:
pass
else
:
copy_list
.
append
(
'slapos.libnetworkcache'
)
copy_list
.
append
(
'slapos.libnetworkcache'
)
for
name
in
copy_list
:
for
name
in
copy_list
:
r
=
pkg_resources
.
Requirement
.
parse
(
name
)
r
=
pkg_resources
.
Requirement
.
parse
(
name
)
...
...
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