X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/42973f687ca3a312303330b0ac50ef618a13381c..7fc96e5a2a4ee1301a7ca4636479261d707c84c8:/IkiWiki/Rcs/tla.pm diff --git a/IkiWiki/Rcs/tla.pm b/IkiWiki/Rcs/tla.pm index 503073d7c..c71c9e6ee 100644 --- 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, ">&SAVEOUT"); close SAVEOUT; return $ret; @@ -88,7 +89,9 @@ sub rcs_recentchanges ($) { return unless -d "$config{srcdir}/{arch}"; eval q{use Date::Parse}; + error($@) if $@; eval q{use Mail::Header}; + error($@) if $@; my $logs = `tla logs -d $config{srcdir}`; my @changesets = reverse split(/\n/, $logs); @@ -104,6 +107,7 @@ sub rcs_recentchanges ($) { 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 @paths = grep { !/^(.*\/)?\.arch-ids\/.*\.id$/ } @@ -157,6 +161,7 @@ sub rcs_notify () { #{{{ my $rev=int(possibly_foolish_untaint($ENV{REV})); eval q{use Mail::Header}; + error($@) if $@; open(LOG, $ENV{"ARCH_LOG"}); my $head = Mail::Header->new(\*LOG); close(LOG); @@ -166,9 +171,10 @@ sub rcs_notify () { #{{{ 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"; @@ -211,6 +217,7 @@ sub rcs_notify () { #{{{ ); eval q{use Mail::Sendmail}; + error($@) if $@; foreach my $email (@email_recipients) { sendmail( To => $email, @@ -225,7 +232,9 @@ sub rcs_notify () { #{{{ sub rcs_getctime ($) { #{{{ my $file=shift; eval q{use Date::Parse}; + error($@) if $@; eval q{use Mail::Header}; + error($@) if $@; my $logs = `tla logs -d $config{srcdir}`; my @changesets = reverse split(/\n/, $logs);