From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Thu, 10 Sep 2009 19:03:18 +0000 (-0400)
Subject: Merge branch 'master' of git://github.com/joeyh/ikiwiki
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/460b1a0debf85f7c54c1dd7d8b8e483587041d44

Merge branch 'master' of git://github.com/joeyh/ikiwiki
---

460b1a0debf85f7c54c1dd7d8b8e483587041d44
diff --cc IkiWiki/Wrapper.pm
index 0baf112ff,cf85738d6..57896e262
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@@ -38,15 -38,13 +38,16 @@@ sub gen_wrapper () 
  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->(); });
 +
  	my $check_commit_hook="";
  	my $pre_exec="";
  	if ($config{post_commit}) {
@@@ -126,11 -120,8 +127,11 @@@ $check_arg
  int main (int argc, char **argv) {
  	char *s;
  
 +	if (!checkargs(argc, argv))
 +		exit(0);
 +
  $check_commit_hook
- $test_receive
+ @wrapper_hooks
  $envsave
  	newenviron[i++]="HOME=$ENV{HOME}";
  	newenviron[i++]="WRAPPED_OPTIONS=$configstring";