From 6605764c523787141272fe83c3d46a65aea7649d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 9 Feb 2009 14:58:10 -0500
Subject: Fix unusual --setup --post-commit command line option combo.

---
 ikiwiki.in | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'ikiwiki.in')

diff --git a/ikiwiki.in b/ikiwiki.in
index 32a24af84..c79a2bfef 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -135,7 +135,8 @@ sub main () {
 
 		if (@{$config{wrappers}} && 
 		    ! $config{render} && ! $config{dumpsetup} &&
-		    (! $config{refresh} || $config{genwrappers})) {
+		    ((! $config{refresh} && ! $config{post_commit})
+		     || $config{genwrappers})) {
 			debug(gettext("generating wrappers.."));
 			require IkiWiki::Wrapper;
 			my %origconfig=(%config);
@@ -157,7 +158,8 @@ sub main () {
 		}
 		
 		# setup implies a wiki rebuild by default
-		if (! $config{refresh} && ! $config{render}) {
+		if (! $config{refresh} && ! $config{render} &&
+		    ! $config{post_commit}) {
 			$config{rebuild}=1;
 		}
 	}
-- 
cgit v1.2.3