From: Adam Sampson <ats@offog.org>
Date: Sat, 26 Jun 2010 10:12:38 +0000 (+0000)
Subject: Respect -v when -c is used, and remove some duplicate code.
X-Git-Tag: v2.13~2
X-Git-Url: http://git.ozo.com/?a=commitdiff_plain;h=478f1bfa89c18e08c67115eb75b1148554a0162d;p=rawdog%2F.git

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

diff --git a/NEWS b/NEWS
index 2dc275d..42776f7 100644
--- 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 037abec..19e1dcd 100644
--- 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"):