Merge lp:~sidnei/juju-deployer/relation-not-in-target into lp:~gandelman-a/juju-deployer/trunk

[Sidnei da Silva]

If a relation is present in source but not in target in relations_combine, it would blow up because the 2nd check (isinstance(target[key], list)) didn't check for 'key' being present in 'target'.

=== modified file 'utils.py'
--- utils.py	2013-03-04 19:14:17 +0000
+++ utils.py	2013-03-12 03:35:25 +0000
@@ -29,14 +29,13 @@
 def relations_combine(onto, source):
     target = deepcopy(onto)
     for (key, value) in source.items():
-        if (key in target and isinstance(target[key], dict) and
-            isinstance(value, dict)):
-            target[key] = relations_combine(target[key], value)
-        else:
-            if isinstance(target[key], list) and isinstance(value, list):
+        if key in target:
+            if isinstance(target[key], dict) and isinstance(value, dict):
+                target[key] = relations_combine(target[key], value)
+            elif isinstance(target[key], list) and isinstance(value, list):
                 target[key] = list(set(target[key] + value))
-            else:
-                target[key] = value
+        else:
+            target[key] = value
     return target