Commit 912ded3e authored by Alain Takoudjou's avatar Alain Takoudjou

bug-fix: prevent buildout to fail when option value is None

parent 87036c5f
...@@ -126,7 +126,7 @@ class Recipe(object): ...@@ -126,7 +126,7 @@ class Recipe(object):
for key, value in parameter_dict.iteritems(): for key, value in parameter_dict.iteritems():
if match(key) is not None: if match(key) is not None:
continue continue
options['configuration.' + key] = value options['configuration.' + key] = value or ''
def fetch_parameter_dict(self, options, instance_root): def fetch_parameter_dict(self, options, instance_root):
"""Gather parameters about current computer and partition. """Gather parameters about current computer and partition.
...@@ -264,7 +264,7 @@ class Recipe(object): ...@@ -264,7 +264,7 @@ class Recipe(object):
# be very careful with overriding master's information # be very careful with overriding master's information
for key, value in flatten_dict(partition_params).items(): for key, value in flatten_dict(partition_params).items():
if key not in options: if key not in options:
options[key] = value options[key] = value or ''
# print out augmented options to see what we are passing # print out augmented options to see what we are passing
logger.debug(str(options)) logger.debug(str(options))
return self._expandParameterDict(options, parameter_dict) return self._expandParameterDict(options, parameter_dict)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment