From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 23 Sep 2008 17:24:20 +0000 (-0400)
Subject: allow setup file to enable verbose mode
X-Git-Tag: 2.65~17
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=c4777e30a94c07b915aa192ec9b24d039ebe76d9

allow setup file to enable verbose mode
---

diff --git a/ikiwiki.in b/ikiwiki.in
index 5c2d710b9..cb9e3c347 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -26,7 +26,7 @@ sub getconfig () { #{{{
 				IkiWiki::Setup::load($_[1]);
 				$config{setupverbose}=$config{verbose};
 				$config{setupsyslog}=$config{syslog};
-				$config{verbose}=$verbose;
+				$config{verbose}=$verbose || $config{setupverbose};
 				$config{syslog}=$syslog;
 				$config{setup}=1;
 			},