Respect -v when -c is used, and remove some duplicate code.

diff --git a/NEWS b/NEWS
index 2dc275dd6e44427381d1f96424654871a90927b2..42776f7a8f30dfb1f3ee12645c545572e150cf8f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -25,6 +25,9 @@ Faelord).
 
 Work around broken DOCTYPEs that confuse sgmllib.
 
+If -v is specified, force verbose on again after reading a secondary
+config file (reported by Jonathan Phillips).
+
 - rawdog 2.12
 
 Make rawdog work with Python 2.6 (reported by Roy Lanek).

diff --git a/rawdoglib/rawdog.py b/rawdoglib/rawdog.py
index 037abec3dd4c7de3387976d7e123a6aac0cca740..19e1dcd97eabd0317f11e352aebaeb9b8a52a620 100644 (file)
--- a/rawdoglib/rawdog.py
+++ b/rawdoglib/rawdog.py
@@ -1696,14 +1696,16 @@ def main(argv):
        sys.path.append(".")
 
        config = Config(locking)
-       try:
-               config.load("config")
-       except ConfigError, err:
-               print >>sys.stderr, "In config:"
-               print >>sys.stderr, err
-               return 1
-       if verbose:
-               config["verbose"] = True
+       def load_config(fn):
+               try:
+                       config.load(fn)
+               except ConfigError, err:
+                       print >>sys.stderr, "In " + fn + ":"
+                       print >>sys.stderr, err
+                       return 1
+               if verbose:
+                       config["verbose"] = True
+       load_config("config")
 
        persister, rawdog = load_persisted("state", Rawdog, config, no_lock_wait)
        if rawdog is None:
@@ -1728,12 +1730,7 @@ def main(argv):
                elif o in ("-w", "--write"):
                        rawdog.write(config)
                elif o in ("-c", "--config"):
-                       try:
-                               config.load(a)
-                       except ConfigError, err:
-                               print >>sys.stderr, "In " + a + ":"
-                               print >>sys.stderr, err
-                               return 1
+                       load_config(a)
                elif o in ("-t", "--show-template"):
                        rawdog.show_template(config)
                elif o in ("-T", "--show-itemtemplate"):