diff options
author | harlowja <harlowja@virtualbox.rhel> | 2012-06-22 22:17:09 -0700 |
---|---|---|
committer | harlowja <harlowja@virtualbox.rhel> | 2012-06-22 22:17:09 -0700 |
commit | 9d1f042f862c114f1613dcd5d2d8c401a1c54eaa (patch) | |
tree | 50c1d4730f3a2e9119f291e4e5f2aabfce33c303 | |
parent | ca51606e4b6e194a35c6bf6d092703e12e55685d (diff) | |
download | vyos-cloud-init-9d1f042f862c114f1613dcd5d2d8c401a1c54eaa.tar.gz vyos-cloud-init-9d1f042f862c114f1613dcd5d2d8c401a1c54eaa.zip |
Fix syntax err, grrr
-rw-r--r-- | cloudinit/util.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cloudinit/util.py b/cloudinit/util.py index 4c521bc3..baa3def1 100644 --- a/cloudinit/util.py +++ b/cloudinit/util.py @@ -643,7 +643,8 @@ def read_conf_d(confd): cfgs = [] for fn in confs: - cfgs.append(read_conf(os.path.join(confd, fn)) + cfgs.append(read_conf(os.path.join(confd, fn))) + return mergemanydict(cfgs) |