Fix service dict merging when only one dict has a volumes key

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
This commit is contained in:
Aanand Prasad 2015-03-23 11:31:30 -07:00
commit 276e43ca6b
2 changed files with 27 additions and 1 deletions

View file

@ -318,7 +318,10 @@ def merge_volumes(base, override):
def dict_from_volumes(volumes):
return dict(split_volume(v) for v in volumes)
if volumes:
return dict(split_volume(v) for v in volumes)
else:
return {}
def split_volume(volume):