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-Tag: 3.14159265~71^2~1
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/460b1a0debf85f7c54c1dd7d8b8e483587041d44?hp=-c

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

460b1a0debf85f7c54c1dd7d8b8e483587041d44
diff --combined IkiWiki.pm
index 48780ae51,187d40a3a..85d8eea68
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@@ -344,7 -344,7 +344,7 @@@ sub getsetup () 
  			qr/\.x?html?$/, qr/\.ikiwiki-new$/,
  			qr/(^|\/).svn\//, qr/.arch-ids\//, qr/{arch}\//,
  			qr/(^|\/)_MTN\//, qr/(^|\/)_darcs\//,
 -			qr/\.dpkg-tmp$/],
 +			qr/(^|\/)CVS\//, qr/\.dpkg-tmp$/],
  		description => "regexps of source files to ignore",
  		safe => 0,
  		rebuild => 1,
@@@ -364,7 -364,7 +364,7 @@@
  	},
  	web_commit_regexp => {
  		type => "internal",
- 		default => qr/^web commit (by (.*?(?=: |$))|from (\d+\.\d+\.\d+\.\d+)):?(.*)/,
+ 		default => qr/^web commit (by (.*?(?=: |$))|from ([0-9a-fA-F:.]+[0-9a-fA-F])):?(.*)/,
  		description => "regexp to parse web commits from logs",
  		safe => 0,
  		rebuild => 0,
diff --combined 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}) {
@@@ -119,18 -117,11 +120,18 @@@ addenv(char *var, char *val) 
  	newenviron[i++]=s;
  }
  
 +int checkargs(int argc, char **argv) {
 +$check_args
 +}
 +
  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";
@@@ -154,7 -145,6 +155,6 @@@ $pre_exe
  	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) {