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
1961d5d4
Commit
1961d5d4
authored
Aug 24, 2011
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Parse certificates which are transmitted as text.
parent
4ae1725a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
3 deletions
+14
-3
src/zc/buildout/download.py
src/zc/buildout/download.py
+7
-2
zc.recipe.egg_/src/zc/recipe/egg/egg.py
zc.recipe.egg_/src/zc/recipe/egg/egg.py
+7
-1
No files found.
src/zc/buildout/download.py
View file @
1961d5d4
...
@@ -77,8 +77,13 @@ class Download(object):
...
@@ -77,8 +77,13 @@ class Download(object):
self
.
upload_dir_url
=
options
.
get
(
'__networkcache__upload-dir-url'
)
self
.
upload_dir_url
=
options
.
get
(
'__networkcache__upload-dir-url'
)
self
.
upload_cache_url
=
options
.
get
(
self
.
upload_cache_url
=
options
.
get
(
'__networkcache__upload-cache-url'
)
'__networkcache__upload-cache-url'
)
self
.
signature_certificate_list
=
options
.
get
(
signature_certificate_list
=
options
.
get
(
'__networkcache__signature-certificate-list'
)
'__networkcache__signature-certificate-list'
,
''
)
# parse signature list
cert_marker
=
'-----BEGIN CERTIFICATE-----'
self
.
signature_certificate_list
=
[
cert_marker
+
'
\
n
'
+
q
.
strip
()
\
for
q
in
signature_certificate_list
.
split
(
cert_marker
)
\
if
q
.
strip
()]
self
.
signature_private_key_file
=
options
.
get
(
self
.
signature_private_key_file
=
options
.
get
(
'__networkcache__signature-private-key-file'
)
'__networkcache__signature-private-key-file'
)
...
...
zc.recipe.egg_/src/zc/recipe/egg/egg.py
View file @
1961d5d4
...
@@ -96,6 +96,12 @@ class Eggs(object):
...
@@ -96,6 +96,12 @@ class Eggs(object):
(
'__networkcache__signature-private-key-file'
,
'signature_private_key_file'
),
(
'__networkcache__signature-private-key-file'
,
'signature_private_key_file'
),
(
'__networkcache__signature-certificate-list'
,
'signature_certificate_list'
)):
(
'__networkcache__signature-certificate-list'
,
'signature_certificate_list'
)):
if
option_key
in
b_options
:
if
option_key
in
b_options
:
if
option_key
==
'__networkcache__signature-certificate-list'
:
cert_marker
=
'-----BEGIN CERTIFICATE-----'
kw
[
kw_key
]
=
[
cert_marker
+
'
\
n
'
+
q
.
strip
()
\
for
q
in
b_options
[
option_key
].
split
(
cert_marker
)
if
q
.
strip
()]
else
:
kw
[
kw_key
]
=
b_options
[
option_key
]
kw
[
kw_key
]
=
b_options
[
option_key
]
ws
=
zc
.
buildout
.
easy_install
.
install
(
ws
=
zc
.
buildout
.
easy_install
.
install
(
...
...
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