aboutsummaryrefslogtreecommitdiff
path: root/ikiwiki.in
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-02-09 14:58:10 -0500
committerJoey Hess <joey@gnu.kitenet.net>2009-02-09 14:58:10 -0500
commit6605764c523787141272fe83c3d46a65aea7649d (patch)
treef2f4c3b598f369fce1d857ee8b74e01ac1f04a56 /ikiwiki.in
parent6b41a240969d8e5b043f811c1d471402746ff0a5 (diff)
downloadikiwiki-6605764c523787141272fe83c3d46a65aea7649d.tar
ikiwiki-6605764c523787141272fe83c3d46a65aea7649d.tar.gz
Fix unusual --setup --post-commit command line option combo.
Diffstat (limited to 'ikiwiki.in')
-rwxr-xr-xikiwiki.in6
1 files changed, 4 insertions, 2 deletions
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;
}
}