Changeset 792 for trunk

Timestamp:

Jul 30, 2008, 9:39:00 PM (16 years ago)

Author:

price

Message:

fix bug in late-import of yaml in invirt.config

Location:

trunk/packages/sipb-xen-base

Files:

• debian/changelog (modified) (1 diff)
• files/usr/share/python-support/sipb-xen-base/invirt/config.py (modified) (2 diffs)

trunk/packages/sipb-xen-base/debian/changelog

@@ +1 @@
+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
 

trunk/packages/sipb-xen-base/files/usr/share/python-support/sipb-xen-base/invirt/config.py

@@ -5 +5 @@
 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 +35 @@
         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)))