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/Receive.pm | |
| parent | f5bd1cf3cd4cc481cfd0bb08ee06aded56fc32ee (diff) | |
| parent | 59c88c255438fabe50115fbfa3adf1327579170d (diff) | |
| download | ikiwiki-93cd30bc0a882037ae2c65c8d6d3a9dc3d09c899.tar ikiwiki-93cd30bc0a882037ae2c65c8d6d3a9dc3d09c899.tar.gz | |
Merge branch 'master' into cvs
Diffstat (limited to 'IkiWiki/Receive.pm')
| -rw-r--r-- | IkiWiki/Receive.pm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm index 31ab3a500..cd94d0938 100644 --- a/IkiWiki/Receive.pm +++ b/IkiWiki/Receive.pm @@ -1,5 +1,4 @@ #!/usr/bin/perl - package IkiWiki::Receive; use warnings; @@ -20,9 +19,9 @@ sub trusted () { ! grep { $_ eq $user } @{$config{untrusted_committers}}; } -sub gen_wrapper () { +sub genwrapper () { # Test for commits from untrusted committers in the wrapper, to - # avoid loading ikiwiki at all for trusted commits. + # avoid starting ikiwiki proper at all for trusted commits. my $ret=<<"EOF"; { @@ -37,6 +36,8 @@ EOF "u != $uid"; } @{$config{untrusted_committers}}). ") exit(0);\n"; + + $ret.=<<"EOF"; asprintf(&s, "CALLER_UID=%i", u); newenviron[i++]=s; |