Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos-caddy
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
Guillaume Hervier
slapos-caddy
Commits
920bde7a
Commit
920bde7a
authored
Oct 18, 2015
by
Ayush Tiwari
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Wendelin: Get empty json object for no erp5_request_parameters
parent
aa2c24ca
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
2 deletions
+9
-2
software/wendelin/software.cfg
software/wendelin/software.cfg
+1
-1
software/wendelin/template/publish-default-information.cfg.in
...ware/wendelin/template/publish-default-information.cfg.in
+8
-1
No files found.
software/wendelin/software.cfg
View file @
920bde7a
...
...
@@ -99,7 +99,7 @@ mode = 0644
[template-publish-information]
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/template/publish-default-information.cfg.in
md5sum = a
b217c0f8d8290c4ccf1fcea4273a6fe
md5sum = a
07f8eb92afd76268e56a90f59a7f7b5
mode = 0644
[versions]
...
...
software/wendelin/template/publish-default-information.cfg.in
View file @
920bde7a
...
...
@@ -6,7 +6,14 @@ eggs-directory = {{ eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }}
offline = true
{% set erp5_request_parameters = json_module.loads(erp5_published_values.get('erp5_request_parameters')) -%}
{% set erp5_request_parameters = erp5_published_values.get('erp5_request_parameters', '{}') -%}
# The previous line might not give valid json for 'None', for that we have to
# explicitly set 'erp5_request_parameters' value for empty json
{% if erp5_request_parameters=='' -%}
{% set erp5_request_parameters = '{}' -%}
{% endif -%}
# Now, we'll load the required json for erp5_request_parameters
{% set erp5_request_parameters = json_module.loads(erp5_request_parameters) -%}
{% set publish_dict = {} -%}
{% for name, value in erp5_request_parameters.iteritems() -%}
...
...
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