update

[git.ikiwiki.info.git] / IkiWiki / Receive.pm

diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm
index 37b6f2a62667600c0ad181eb448d4629504bdd4c..cd94d093853023b0c7e2c6f29649c4b6d920c220 100644 (file)
--- a/IkiWiki/Receive.pm
+++ b/IkiWiki/Receive.pm
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
 #!/usr/bin/perl

-

 package IkiWiki::Receive;
 
 use warnings;
 package IkiWiki::Receive;
 
 use warnings;


@@ -20,9 +19,9 @@ sub trusted () {
                ! grep { $_ eq $user } @{$config{untrusted_committers}};
 }
 
                ! grep { $_ eq $user } @{$config{untrusted_committers}};
 }
 

-sub gen_wrapper () {
+sub genwrapper () {

        # Test for commits from untrusted committers in the wrapper, to
        # 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";
        {
 
        my $ret=<<"EOF";
        {


@@ -37,6 +36,8 @@ EOF
                        "u != $uid";
                } @{$config{untrusted_committers}}).
                ") exit(0);\n";
                        "u != $uid";
                } @{$config{untrusted_committers}}).
                ") exit(0);\n";

+
+       

        $ret.=<<"EOF";
                asprintf(&s, "CALLER_UID=%i", u);
                newenviron[i++]=s;
        $ret.=<<"EOF";
                asprintf(&s, "CALLER_UID=%i", u);
                newenviron[i++]=s;


@@ -114,7 +115,7 @@ sub test () {
                        # by not testing the removal in such pairs of changes.
                        # (The add is still tested, just to make sure that
                        # no data is added to the repo that a web edit
                        # by not testing the removal in such pairs of changes.
                        # (The add is still tested, just to make sure that
                        # no data is added to the repo that a web edit

-                       # could add.)
+                       # could not add.)

                        next if $newfiles{$file};
 
                        if (IkiWiki::Plugin::remove->can("check_canremove")) {
                        next if $newfiles{$file};
 
                        if (IkiWiki::Plugin::remove->can("check_canremove")) {