projects
/
ikiwiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
do no-op post_commit test in wrapper
[ikiwiki.git]
/
ikiwiki.in
diff --git
a/ikiwiki.in
b/ikiwiki.in
index f96daab0bb9c55233c2a5a1e0f38a0596d3a1e0f..af5cabdc04fd687691f3b286a31cc44e2e0428be 100755
(executable)
--- a/
ikiwiki.in
+++ b/
ikiwiki.in
@@
-118,6
+118,7
@@
sub getconfig () { #{{{
error("WRAPPED_OPTIONS: $@");
}
delete $ENV{WRAPPED_OPTIONS};
error("WRAPPED_OPTIONS: $@");
}
delete $ENV{WRAPPED_OPTIONS};
+
loadplugins();
checkconfig();
}
loadplugins();
checkconfig();
}
@@
-145,7
+146,8
@@
sub main () { #{{{
if exists $config{setupsyslog};
delete @config{qw(setupsyslog setupverbose wrappers genwrappers rebuild)};
checkconfig();
if exists $config{setupsyslog};
delete @config{qw(setupsyslog setupverbose wrappers genwrappers rebuild)};
checkconfig();
- if (! $config{cgi} && ! $config{post_commit}) {
+ if (! $config{cgi} && ! $config{post_commit} &&
+ ! $config{test_receive}) {
$config{post_commit}=1;
}
gen_wrapper();
$config{post_commit}=1;
}
gen_wrapper();
@@
-183,8
+185,12
@@
sub main () { #{{{
elsif ($config{post_commit} && ! commit_hook_enabled()) {
# do nothing
}
elsif ($config{post_commit} && ! commit_hook_enabled()) {
# do nothing
}
+ elsif ($config{test_receive}) {
+ require IkiWiki::Receive;
+ IkiWiki::Receive::test();
+ }
else {
else {
- if (
! $config{refresh
}) {
+ if (
$config{rebuild
}) {
debug(gettext("rebuilding wiki.."));
}
else {
debug(gettext("rebuilding wiki.."));
}
else {