Index: /trunk/packages/sipb-xen-base/debian/changelog
===================================================================
--- /trunk/packages/sipb-xen-base/debian/changelog	(revision 791)
+++ /trunk/packages/sipb-xen-base/debian/changelog	(revision 792)
@@ -1,2 +1,10 @@
+sipb-xen-base (8.12) unstable; urgency=low
+
+  * add --ls and some convenience features to invirt-getconf:
+    formatting composite nodes as yaml, allowing the root
+  * fix bug in late-import of yaml in invirt.config
+
+ -- Greg Price <price@mit.edu>  Wed, 30 Jul 2008 21:36:17 -0400
+
 sipb-xen-base (8.11) unstable; urgency=low
 
Index: /trunk/packages/sipb-xen-base/files/usr/share/python-support/sipb-xen-base/invirt/config.py
===================================================================
--- /trunk/packages/sipb-xen-base/files/usr/share/python-support/sipb-xen-base/invirt/config.py	(revision 791)
+++ /trunk/packages/sipb-xen-base/files/usr/share/python-support/sipb-xen-base/invirt/config.py	(revision 792)
@@ -5,7 +5,4 @@
 default_src_path   = '/etc/invirt/master.yaml'
 default_cache_path = '/var/lib/invirt/cache.json'
-
-try:    default_loader = yaml.CSafeLoader
-except: default_loader = yaml.SafeLoader
 
 def load(src_path = default_src_path,
@@ -38,4 +35,6 @@
         def cfg():
             import yaml
+            try:    default_loader = yaml.CSafeLoader
+            except: default_loader = yaml.SafeLoader
             cfg = with_closing(file(src_path))(lambda f: yaml.load(f, default_loader))
             try: with_closing(file(cache_path, 'w'))(lambda f: f.write(json.write(cfg)))