Commit bbf2e09a authored by Łukasz Nowak's avatar Łukasz Nowak

Merge branch 'bug_778748'

parents 20cc3ef4 8c7c1e64
...@@ -1245,6 +1245,17 @@ def _install_and_load(spec, group, entry, buildout): ...@@ -1245,6 +1245,17 @@ def _install_and_load(spec, group, entry, buildout):
dest = buildout_options['eggs-directory'] dest = buildout_options['eggs-directory']
path = [buildout_options['develop-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( zc.buildout.easy_install.install(
[spec], dest, [spec], dest,
links=buildout._links, links=buildout._links,
...@@ -1263,8 +1274,7 @@ def _install_and_load(spec, group, entry, buildout): ...@@ -1263,8 +1274,7 @@ def _install_and_load(spec, group, entry, buildout):
upload_dir_url=buildout_options.get('__networkcache__upload-dir-url'), upload_dir_url=buildout_options.get('__networkcache__upload-dir-url'),
signature_private_key_file=buildout_options.get( signature_private_key_file=buildout_options.get(
'__networkcache__signature-private-key-file'), '__networkcache__signature-private-key-file'),
signature_certificate_list=buildout_options.get( signature_certificate_list=signature_certificate_list,
'__networkcache__signature-certificate-list'),
shacache_cert_file=buildout_options.get( shacache_cert_file=buildout_options.get(
'__networkcache__shacache-cert-file'), '__networkcache__shacache-cert-file'),
shacache_key_file=buildout_options.get( shacache_key_file=buildout_options.get(
......
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