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
8
Merge Requests
8
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
slapos.buildout
Commits
8c7c1e64
Commit
8c7c1e64
authored
Nov 10, 2011
by
Antoine Catton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixing the bug with CallProcessError openssl.
It wasn't related to openssl.
parent
79064a17
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
2 deletions
+12
-2
src/zc/buildout/buildout.py
src/zc/buildout/buildout.py
+12
-2
No files found.
src/zc/buildout/buildout.py
View file @
8c7c1e64
...
...
@@ -1208,6 +1208,17 @@ def _install_and_load(spec, group, entry, buildout):
dest
=
buildout_options
[
'eggs-directory'
]
path
=
[
buildout_options
[
'develop-eggs-directory'
]]
# parse signature list
signature_certificate
=
buildout_options
.
get
(
'__networkcache__signature-certificate-list'
)
if
signature_certificate
is
not
None
:
cert_marker
=
'-----BEGIN CERTIFICATE-----'
signature_certificate_list
=
[
cert_marker
+
'
\
n
'
+
q
.
strip
()
\
for
q
in
signature_certificate
.
split
(
cert_marker
)
\
if
q
.
strip
()]
else
:
signature_certificate_list
=
None
zc
.
buildout
.
easy_install
.
install
(
[
spec
],
dest
,
links
=
buildout
.
_links
,
...
...
@@ -1226,8 +1237,7 @@ def _install_and_load(spec, group, entry, buildout):
upload_dir_url
=
buildout_options
.
get
(
'__networkcache__upload-dir-url'
),
signature_private_key_file
=
buildout_options
.
get
(
'__networkcache__signature-private-key-file'
),
signature_certificate_list
=
buildout_options
.
get
(
'__networkcache__signature-certificate-list'
),
signature_certificate_list
=
signature_certificate_list
,
shacache_cert_file
=
buildout_options
.
get
(
'__networkcache__shacache-cert-file'
),
shacache_key_file
=
buildout_options
.
get
(
...
...
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