Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
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
Gwenaël Samain
slapos
Commits
2e121774
Commit
2e121774
authored
Oct 20, 2011
by
Romain Courteaud
Committed by
Antoine Catton
Oct 20, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow to propagate multilines parameter
This is a cherry-pick of
20c649eb
impacting only request recipe.
parent
0a1ad733
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
6 deletions
+5
-6
slapos/recipe/request.py
slapos/recipe/request.py
+5
-6
No files found.
slapos/recipe/request.py
View file @
2e121774
...
...
@@ -31,10 +31,6 @@ from slapos import slap as slapmodule
class
Recipe
(
object
):
def
parseMultiValues
(
self
,
string
):
return
dict
([
[
str
(
column
).
strip
()
for
column
in
line
.
split
(
'='
,
1
)]
for
line
in
str
(
string
).
splitlines
()
if
'='
in
line
])
def
__init__
(
self
,
buildout
,
name
,
options
):
self
.
logger
=
logging
.
getLogger
(
name
)
...
...
@@ -67,11 +63,14 @@ class Recipe(object):
filter_kw
=
{}
if
'sla'
in
options
:
filter_kw
=
self
.
parseMultiValues
(
options
[
'sla'
])
for
sla_parameter
in
options
[
'sla'
].
split
():
filter_kw
[
sla_parameter
]
=
options
[
'sla-%s'
%
sla_parameter
]
partition_parameter_kw
=
{}
if
'config'
in
options
:
partition_parameter_kw
=
self
.
parseMultiValues
(
options
[
'config'
])
for
config_parameter
in
options
[
'config'
].
split
():
partition_parameter_kw
[
config_parameter
]
=
\
options
[
'config-%s'
%
config_parameter
]
instance
=
self
.
request
(
options
[
'software-url'
],
software_type
,
options
[
'name'
],
partition_parameter_kw
=
partition_parameter_kw
,
...
...
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