diff options
author | Joey Hess <joey@kodama.kitenet.net> | 2008-10-23 16:29:50 -0400 |
---|---|---|
committer | Joey Hess <joey@kodama.kitenet.net> | 2008-10-23 16:29:50 -0400 |
commit | 4669eab596c8d90de0cf9f9d359ad8dd8f48edb5 (patch) | |
tree | 9d9adf2b1a873a54adb6fc239b3d9209ea314471 /ikiwiki.in | |
parent | 62962a470d48dd14ebcd39f1de37504abd2f77b5 (diff) | |
download | ikiwiki-4669eab596c8d90de0cf9f9d359ad8dd8f48edb5.tar ikiwiki-4669eab596c8d90de0cf9f9d359ad8dd8f48edb5.tar.gz |
more work on untrusted committers
Wired up check_canedit and check_canremove, still need to deal with
check_canattach, and test.
Diffstat (limited to 'ikiwiki.in')
-rwxr-xr-x | ikiwiki.in | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/ikiwiki.in b/ikiwiki.in index 22addb463..60663bc89 100755 --- a/ikiwiki.in +++ b/ikiwiki.in @@ -119,10 +119,15 @@ sub getconfig () { #{{{ } delete $ENV{WRAPPED_OPTIONS}; - # optimisation for no-op post_commit if ($config{post_commit} && ! commit_hook_enabled()) { + # optimisation for no-op post_commit exit 0; } + elsif ($config{test_receive}) { + # quick success if the user is trusted + require IkiWiki::Receive; + exit 0 if IkiWiki::Receive::trusted(); + } loadplugins(); checkconfig(); @@ -190,7 +195,8 @@ sub main () { #{{{ # do nothing } elsif ($config{test_receive}) { - rcs_test_receive(); + require IkiWiki::Receive; + IkiWiki::Receive::test(); } else { if ($config{rebuild}) { |