Changeset 1933 for trunk/packages/invirt-base

Timestamp:

Dec 28, 2008, 7:19:55 PM (16 years ago)

Author:

price

Message:

invirt.config: fix an error on empty config files

Location:

trunk/packages/invirt-base

Files:

• debian/changelog (modified) (1 diff)
• python/invirt/config.py (modified) (2 diffs)

trunk/packages/invirt-base/debian/changelog

@@ -3 +3 @@
   * run_parts_list: fix unclear docstring
   * config-init.sh: degrade to non-bash gracefully, document better
-
- -- Greg Price <price@mit.edu>  Sun, 28 Dec 2008 02:46:33 -0500
+  * invirt.config: fix an error on empty config files
+
+ -- Greg Price <price@mit.edu>  Sun, 28 Dec 2008 19:16:03 -0500
 
 invirt-base (0.0.17) unstable; urgency=low

trunk/packages/invirt-base/python/invirt/config.py

@@ -21 +21 @@
     """Splice dict-tree d2 into d1.  Return d1.
 
+    d2 may be None for an empty dict-tree, because yaml.load produces that.
+
     Example:
     >>> d = {'a': {'b': 1}, 'c': 2}
@@ -28 +30 @@
     {'a': {'b', 1, 'd': 3}, 'c': 2}
     """
+    if d2 is None:
+        return d1
     for k in d2:
         if k in d1 and isinstance(d1[k], dict):