From ac7d3e06f5f881c3818b9e47b09bad4eaa47784e Mon Sep 17 00:00:00 2001
From: Greg Price <price@mit.edu>
Date: Sat, 2 Aug 2008 21:59:48 -0400
Subject: [PATCH] sign packages in apt repo

svn path=/trunk/packages/sipb-xen-base/; revision=822
---
 debian/changelog                       |    6 ++++++
 files/usr/{sbin => bin}/invirt-getconf |   10 ++++------
 2 files changed, 10 insertions(+), 6 deletions(-)
 rename files/usr/{sbin => bin}/invirt-getconf (90%)

diff --git a/debian/changelog b/debian/changelog
index 52056be..105376b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sipb-xen-base (8.15) unstable; urgency=low
+
+  * put invirt-getconf in /usr/bin
+
+ -- Greg Price <price@mit.edu>  Sat,  2 Aug 2008 21:58:36 -0400
+
 sipb-xen-base (8.14) unstable; urgency=low
 
   * using correct default paths in invirt-getconf
diff --git a/files/usr/sbin/invirt-getconf b/files/usr/bin/invirt-getconf
similarity index 90%
rename from files/usr/sbin/invirt-getconf
rename to files/usr/bin/invirt-getconf
index bb4fd80..4721212 100755
--- a/files/usr/sbin/invirt-getconf
+++ b/files/usr/bin/invirt-getconf
@@ -16,7 +16,7 @@ Examples:
   invirt-getconf authn.0.type
 """
 
-from invirt.config import default_src_path, default_cache_path, load
+from invirt.config import load
 from sys import argv, exit, stderr, stdout
 from optparse import OptionParser
 
@@ -27,10 +27,10 @@ def main(argv):
         parser = OptionParser(usage = '%prog [options] key',
                 description = __doc__.strip().split('\n\n')[0])
         parser.add_option('-s', '--src',
-                default = default_src_path,
+                default = '/etc/invirt/master.yaml',
                 help = 'the source YAML configuration file to read from')
         parser.add_option('-c', '--cache',
-                default = default_cache_path,
+                default = '/var/lib/invirt/invirt.json',
                 help = 'path to the JSON cache')
         parser.add_option('-r', '--refresh',
                 action = 'store_true',
@@ -80,10 +80,8 @@ def main(argv):
                 print conf
             else:
                 import yaml
-                try:    dumper = yaml.CSafeDumper
-                except: dumper = yaml.SafeDumper
                 yaml.dump(conf, stdout,
-                          Dumper = dumper, default_flow_style = False)
+                          Dumper=yaml.CSafeDumper, default_flow_style=False)
     except invirt_exception, ex:
         print >> stderr, ex
         return 1
-- 
1.7.9.5