summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cloudinit/CloudConfig/cc_landscape.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/cloudinit/CloudConfig/cc_landscape.py b/cloudinit/CloudConfig/cc_landscape.py
index 6849b732..e3e4f7ba 100644
--- a/cloudinit/CloudConfig/cc_landscape.py
+++ b/cloudinit/CloudConfig/cc_landscape.py
@@ -56,10 +56,8 @@ def mergeTogether(objs):
merge together ConfigObj objects or things that ConfigObj() will take in
later entries override earlier
"""
- if len(objs) == 0:
- return { }
- cfg = ConfigObj(objs[1])
- for obj in objs[1:]:
+ cfg = ConfigObj({})
+ for obj in objs:
if isinstance(obj, ConfigObj):
cfg.merge(obj)
else: