Permalink
Browse files

Fixed utils.combine_vars to always return dict

  • Loading branch information...
1 parent 8cc588e commit ace7658b483999f835a499fe2e0eed2ff4a9ba0c @laggyluke committed Mar 26, 2013
Showing with 4 additions and 4 deletions.
  1. +4 −4 lib/ansible/utils/__init__.py
@@ -661,7 +661,7 @@ def is_list_of_strings(items):
return True
def combine_vars(a, b):
- if C.DEFAULT_HASH_BEHAVIOUR == "merge":
- return merge_hash(a, b)
- else:
- return a.update(b)
+ if C.DEFAULT_HASH_BEHAVIOUR == "merge":
+ return merge_hash(a, b)
+ else:
+ return dict(a.items() + b.items())

0 comments on commit ace7658

Please sign in to comment.