diff --git a/slapos/recipe/generate_cloudooo.py b/slapos/recipe/generate_cloudooo.py index 6c788144652d48e89ffb263431202501209124b8..0a119a796df8790d63bc724222e9f7b34fd748ed 100644 --- a/slapos/recipe/generate_cloudooo.py +++ b/slapos/recipe/generate_cloudooo.py @@ -38,7 +38,9 @@ class Recipe(GenericSlapRecipe): def _generateRealTemplate(self): # TODO check json against schema - json_data = json.loads(self.parameter_dict['cloudooo-json']) + json_data = {} + if self.parameter_dict.get('cloudooo-json', None): + json_data = json.loads(self.parameter_dict['cloudooo-json']) # dymanic fonts font_url_list = json_data.get('font_url_list', []) fontconfig_template = open(self.options['template']).read() @@ -50,10 +52,9 @@ class Recipe(GenericSlapRecipe): def _install(self): if not os.path.exists(self.dirname): os.mkdir(self.dirname) - if "cloudooo-json" in self.parameter_dict: - try: - self._generateRealTemplate() - except Exception: - print 'Ignored issue during template generation:\n%s' % \ - traceback.format_exc() + try: + self._generateRealTemplate() + except Exception: + print 'Ignored issue during template generation:\n%s' % \ + traceback.format_exc() return [self.dirname] diff --git a/software/erp5/instance-erp5-development.cfg b/software/erp5/instance-erp5-development.cfg index 8e39ad782c48f01eb2fece4d8eed7ce003ec1275..bcd2a1d810f486999e84cb97c5d8f5e74ede571e 100644 --- a/software/erp5/instance-erp5-development.cfg +++ b/software/erp5/instance-erp5-development.cfg @@ -22,6 +22,7 @@ offline = true [slap-parameter] # default site id site-id = erp5 +cloudooo-json = [test-runner] recipe = slapos.cookbook:erp5.test