Switch over to more Options usage and complete tests (everything appears to work now)

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4142 ce84e21b-d406-0410-9b95-82705330c041

1 files changed, 4 insertions, 10 deletions

diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info
index 6693efea2..bde7ef868 100755
--- a/src/sbin/bcfg2-info
+++ b/src/sbin/bcfg2-info
@@ -6,7 +6,6 @@ import copy, logging, lxml.etree, sys, time, cmd
 import Bcfg2.Logging, Bcfg2.Server.Core, os
 import Bcfg2.Server.Plugins.Metadata, Bcfg2.Server.Plugin
 import Bcfg2.Options
-from Bcfg2.Settings import settings
 
 logger = logging.getLogger('bcfg2-info')
 
@@ -263,16 +262,11 @@ if __name__ == '__main__':
     Bcfg2.Logging.setup_logging('bcfg2-info', to_syslog=False)
 
     optinfo = {
-            'configfile': (('-C', '<configfile>', "use given config file (default /etc/bcfg2.conf)"),
-                      False, False, '/etc/bcfg2.conf', False),
-            'help': (('-h', False, "print this help message"),
-                     False, False, False, True)
+            'configfile': Bcfg2.Options.CFILE, 
+            'help': Bcfg2.Options.HELP,
               }
-    optparser = Bcfg2.Options.OptionParser('bcfg2-info', optinfo)
-    setup = optparser.parse()
-
-    # override default settings
-    settings.read_config_file(setup['configfile'])
+    setup = Bcfg2.Options.OptionParser(optinfo)
+    setup.parse(sys.argv[1:])
 
     loop = infoCore()
     loop.plugins['Metadata'].load_probedata()