diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-09-10 16:18:23 -0400 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-09-10 16:18:23 -0400 |
| commit | 93cd30bc0a882037ae2c65c8d6d3a9dc3d09c899 (patch) | |
| tree | 33599fa45d5517e3ce743dabe1f6731ab44c27d3 /IkiWiki/Wrapper.pm | |
| parent | f5bd1cf3cd4cc481cfd0bb08ee06aded56fc32ee (diff) | |
| parent | 59c88c255438fabe50115fbfa3adf1327579170d (diff) | |
| download | ikiwiki-93cd30bc0a882037ae2c65c8d6d3a9dc3d09c899.tar ikiwiki-93cd30bc0a882037ae2c65c8d6d3a9dc3d09c899.tar.gz | |
Merge branch 'master' into cvs
Diffstat (limited to 'IkiWiki/Wrapper.pm')
| -rw-r--r-- | IkiWiki/Wrapper.pm | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm index 0baf112ff..53ac5099a 100644 --- a/IkiWiki/Wrapper.pm +++ b/IkiWiki/Wrapper.pm @@ -37,12 +37,9 @@ sub gen_wrapper () { addenv("$var", s); EOF } - - my $test_receive=""; - if ($config{test_receive}) { - require IkiWiki::Receive; - $test_receive=IkiWiki::Receive::gen_wrapper(); - } + + my @wrapper_hooks; + run_hooks(genwrapper => sub { push @wrapper_hooks, shift->() }); my $check_args=" return 0;"; run_hooks(wrapperargcheck => sub { $check_args = shift->(); }); @@ -130,7 +127,7 @@ int main (int argc, char **argv) { exit(0); $check_commit_hook -$test_receive +@wrapper_hooks $envsave newenviron[i++]="HOME=$ENV{HOME}"; newenviron[i++]="WRAPPED_OPTIONS=$configstring"; @@ -154,7 +151,6 @@ $pre_exec exit(1); } EOF - close OUT; my $cc=exists $ENV{CC} ? possibly_foolish_untaint($ENV{CC}) : 'cc'; if (system($cc, "$wrapper.c", "-o", "$wrapper.new") != 0) { |