From cc4b5aa6452aa0c04d996ae93d695202fa05f6a0 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Tue, 28 Aug 2012 15:36:58 -0400
Subject: Options: misc. minor fixes

---
 src/lib/Bcfg2/Options.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/lib/Bcfg2/Options.py b/src/lib/Bcfg2/Options.py
index 6a50d3313..76868e991 100644
--- a/src/lib/Bcfg2/Options.py
+++ b/src/lib/Bcfg2/Options.py
@@ -185,9 +185,12 @@ class OptionSet(dict):
             self.cfile = kwargs['configfile']
         else:
             self.cfile = DEFAULT_CONFIG_LOCATION
+        if 'quiet' in kwargs:
+            self.quiet = kwargs['quiet']
+        else:
+            self.quiet = False
         self.cfp = DefaultConfigParser()
-        if (len(self.cfp.read(self.cfile)) == 0 and
-            ('quiet' not in kwargs or not kwargs['quiet'])):
+        if len(self.cfp.read(self.cfile)) == 0 and not self.quiet:
             # suppress warnings if called from bcfg2-admin init
             caller = inspect.stack()[-1][1].split('/')[-1]
             if caller == 'bcfg2-admin' and len(sys.argv) > 1:
@@ -524,6 +527,7 @@ WEB_CFILE = \
     Option('Web interface configuration file',
            default="/etc/bcfg2-web.conf",
            cmd='-W',
+           odesc='<conffile>',
            cf=('statistics', 'config'),)
 DJANGO_TIME_ZONE = \
     Option('Django timezone',
@@ -1027,6 +1031,7 @@ CLIENT_COMMON_OPTIONS.update(DRIVER_OPTIONS)
 CLIENT_COMMON_OPTIONS.update(CLI_COMMON_OPTIONS)
 
 DATABASE_COMMON_OPTIONS = dict(web_configfile=WEB_CFILE,
+                               configfile=CFILE,
                                db_engine=DB_ENGINE,
                                db_name=DB_NAME,
                                db_user=DB_USER,
-- 
cgit v1.2.3-1-g7c22