diff --git a/software/wendelin/software.cfg b/software/wendelin/software.cfg index 4f1f97bd84aa8c30c00f7de3327a39db38ee975e..2f02946f97797ac448d9b79e29317bfe16e1a4d1 100644 --- a/software/wendelin/software.cfg +++ b/software/wendelin/software.cfg @@ -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 = ab217c0f8d8290c4ccf1fcea4273a6fe +md5sum = a07f8eb92afd76268e56a90f59a7f7b5 mode = 0644 [versions] diff --git a/software/wendelin/template/publish-default-information.cfg.in b/software/wendelin/template/publish-default-information.cfg.in index 6d0c56b08d5234202dff7b7d4cb4dd43d854f393..4ffee990f205ee3d8d967f4fcd094394d33e36f8 100644 --- a/software/wendelin/template/publish-default-information.cfg.in +++ b/software/wendelin/template/publish-default-information.cfg.in @@ -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() -%}