* Avoid syntax errors in templates used by the template plugin crashing

[ikiwiki.git] / IkiWiki / Rcs / tla.pm

diff --git a/IkiWiki/Rcs/tla.pm b/IkiWiki/Rcs/tla.pm
index 61f49cc1b1665f5f071ba22bf3b1b57cf5d79a2b..c9b64dbe5e09f4556126b5f1026c75a53fe22dc3 100644 (file)
--- a/IkiWiki/Rcs/tla.pm
+++ b/IkiWiki/Rcs/tla.pm
@@ -15,6 +15,7 @@ sub quiet_system (@) {
        close STDOUT;
        open (STDOUT, ">/dev/null");
        my $ret=system(@_);
        close STDOUT;
        open (STDOUT, ">/dev/null");
        my $ret=system(@_);

+       close STDOUT;

        open (STDOUT, ">&SAVEOUT");
        close SAVEOUT;
        return $ret;
        open (STDOUT, ">&SAVEOUT");
        close SAVEOUT;
        return $ret;


@@ -104,10 +105,11 @@ sub rcs_recentchanges ($) {
                my $summ = $head->get("Summary");
                my $newfiles = $head->get("New-files");
                my $modfiles = $head->get("Modified-files");
                my $summ = $head->get("Summary");
                my $newfiles = $head->get("New-files");
                my $modfiles = $head->get("Modified-files");

+               my $remfiles = $head->get("Removed-files");

                my $user = $head->get("Creator");
 
                my $user = $head->get("Creator");
 

-               my @paths = grep {!/^(.*\/\)?.arch-ids\/.*\.id$/} split(/ /,
-                       "$newfiles $modfiles");
+               my @paths = grep { !/^(.*\/)?\.arch-ids\/.*\.id$/ }
+                       split(/ /, "$newfiles $modfiles .arch-ids/fake.id");

 
                my $sdate = $head->get("Standard-date");
                my $when = time - str2time($sdate, 'UTC');
 
                my $sdate = $head->get("Standard-date");
                my $when = time - str2time($sdate, 'UTC');


@@ -166,9 +168,10 @@ sub rcs_notify () { #{{{
 
        my $newfiles = $head->get("New-files");
        my $modfiles = $head->get("Modified-files");
 
        my $newfiles = $head->get("New-files");
        my $modfiles = $head->get("Modified-files");

+       my $remfiles = $head->get("Removed-files");

 
 

-       my @changed_pages = grep {!/(^.*\/)?\.arch-ids\/.*\.id$/} split(/ /,
-               "$newfiles $modfiles");
+       my @changed_pages = grep { !/(^.*\/)?\.arch-ids\/.*\.id$/ }
+               split(/ /, "$newfiles $modfiles $remfiles .arch-ids/fake.id");

 
        if ($message =~ /$tla_webcommit/) {
                $user=defined $2 ? "$2" : "$3";
 
        if ($message =~ /$tla_webcommit/) {
                $user=defined $2 ? "$2" : "$3";