#!/usr/bin/perl
-# $Id: process.in,v 1.102 2005/08/17 21:46:16 don Exp $
+# $Id: process.in,v 1.109 2006/02/09 22:02:04 don Exp $
#
# Usage: process nn
# Temps: incoming/Pnn
$ENV{"TZ"} = 'UTC';
tzset();
-use IO::File;
use MIME::Parser;
-use Debbugs::MIME qw(decode_rfc1522);
+use Debbugs::MIME qw(decode_rfc1522 create_mime_message);
use Debbugs::Mail qw(send_mail_message encode_headers);
$config_path = '/etc/debbugs';
@bodylines = @msg[$i..$#msg];
}
+my %header;
+
for my $hdr (@headerlines) {
$hdr = decode_rfc1522($hdr);
$_ = $hdr;
print DEBUG ">$fn~$fv<\n";
}
+# Allow pseudo headers to set x-debbugs- stuff [#179340]
+for my $key (grep /X-Debbugs-.*/i, keys %pheader) {
+ $header{$key} = $pheader{$key} if not exists $header{$key};
+}
$fwd .= join("\n",@msg[$i..$#msg]);
}
$markedby= $header{'from'} eq $replyto ? $replyto :
"$header{'from'} (reply to $replyto)";
+ my @generalcc;
if ($codeletter eq 'F') {
(&appendlog,&finish) if length($data->{forwarded});
$receivedat= "forwarded\@$gEmailDomain";
$markaswhat= 'forwarded';
$set_forwarded= $header{'to'};
if ( length( $gListDomain ) > 0 && length( $gForwardList ) > 0 ) {
+ push @generalcc, "$gForwardList\@$gListDomain";
$generalcc= "$gForwardList\@$gListDomain";
} else {
$generalcc='';
$set_done= $header{'from'};
if ( length( $gListDomain ) > 0 && length( $gDoneList ) > 0 ) {
$generalcc= "$gDoneList\@$gListDomain";
+ push @generalcc, "$gDoneList\@$gListDomain";
} else {
$generalcc='';
}
}
if (defined $gStrongList and isstrongseverity($data->{severity})) {
$generalcc = join ', ', $generalcc, "$gStrongList\@$gListDomain";
+ push @generalcc,"$gStrongList\@$gListDomain";
}
if ($ref<0) {
&htmllog("Warning","sent",$replyto,"Message ignored.");
&checkmaintainers;
- # Add bug mailing lists as appropriate
- my @bug_mailing_lists;
- push @bug_mailing_lists, map {"bugs=$_\@$gListDomain"} ($ref, split (/ /, $data->{mergedwith}));
-
+ my @noticecc = grep($_ ne $replyto,@maintaddrs);
$noticeccval.= join(', ', grep($_ ne $replyto,@maintaddrs));
$noticeccval =~ s/\s+\n\s+/ /g;
$noticeccval =~ s/^\s+/ /; $noticeccval =~ s/\s+$//;
-
- $generalcc = join(', ', $generalcc, @addsrcaddrs, @bug_mailing_lists);
- $generalcc =~ s/\s+\n\s+/ /g;
- $generalcc =~ s/^\s+/ /; $generalcc =~ s/\s+$//;
-
if (length($noticeccval)) { $noticecc= "Cc: $noticeccval\n"; }
- if (length($generalcc)) { $noticecc.= "Bcc: $generalcc\n"; }
@process= ($ref,split(/ /,$data->{mergedwith}));
$orgref= $ref;
}
}
+ # Add bug mailing list to $generalbcc as appropriate
+ # This array is used to specify bcc in the cases where we're using create_mime_message.
+ my @generalbcc = (@generalcc,@addsrcaddrs,"bugs=$ref\@$gListDomain");
+ my $generalbcc = join(', ', $generalcc, @addsrcaddrs,"bugs=$ref\@$gListDomain");
+ $generalbcc =~ s/\s+\n\s+/ /g;
+ $generalbcc =~ s/^\s+/ /; $generalbcc =~ s/\s+$//;
+ if (length $generalbcc) {$generalbcc = "Bcc: $generalbcc\n"};
+
writebug($ref, $data);
my $hash = get_hashname($ref);
$x= join('',<O>); close(O);
if ($codeletter eq 'F') {
&htmllog("Reply","sent",$replyto,"You have marked $gBug as forwarded.");
- &sendmessage(<<END."---------------------------------------\n".join( "\n", @msg ), '');
-From: $gMaintainerEmail ($gProject $gBug Tracking System)
-To: $replyto
-${noticecc}Subject: $gBug#$ref: marked as forwarded ($data->{subject})
-Message-ID: <header.$ref.$nn.ackfwdd\@$gEmailDomain>
-In-Reply-To: $header{'message-id'}
-References: $header{'message-id'} $data->{msgid}
-Precedence: bulk
-X-$gProject-PR-Message: forwarded $ref
-X-$gProject-PR-Package: $data->{package}
-X-$gProject-PR-Keywords: $data->{keywords}
-
+ &sendmessage(create_mime_message(
+ ["X-Loop" => "$gMaintainerEmail",
+ From => "$gMaintainerEmail ($gProject $gBug Tracking System)",
+ To => "$replyto",
+ Subject => "$gBug#$ref: marked as forwarded ($data->{subject})",
+ "Message-ID" => "<header.$ref.$nn.ackfwdd\@$gEmailDomain>",
+ "In-Reply-To" => $header{'message-id'},
+ References => "$header{'message-id'} $data->{msgid}",
+ Precedence => 'bulk',
+ "X-$gProject-PR-Message" => "forwarded $ref",
+ "X-$gProject-PR-Package" => $data->{package},
+ "X-$gProject-PR-Keywords" => $data->{keywords}
+ ],<<END ,[join("\n",@msg)]),'',[$replyto,@generalbcc,@noticecc],1);
Your message dated $header{'date'}
with message-id $header{'message-id'}
has caused the $gProject $gBug report #$ref,
} else {
&htmllog("Reply","sent",$replyto,"You have taken responsibility.");
- &sendmessage(<<END."--------------------------------------\n".$x."---------------------------------------\n".join( "\n", @msg ), '');
-From: $gMaintainerEmail ($gProject $gBug Tracking System)
-To: $replyto
-${noticecc}Subject: $gBug#$ref: marked as done ($data->{subject})
-Message-ID: <handler.$ref.$nn.ackdone\@$gEmailDomain>
-In-Reply-To: $header{'message-id'}
-References: $header{'message-id'} $data->{msgid}
-Precedence: bulk
-X-$gProject-PR-Message: closed $ref
-X-$gProject-PR-Package: $data->{package}
-X-$gProject-PR-Keywords: $data->{keywords}
-
+ &sendmessage(create_mime_message(
+ ["X-Loop" => "$gMaintainerEmail",
+ From => "$gMaintainerEmail ($gProject $gBug Tracking System)",
+ To => $replyto,
+ Subject => "$gBug#$ref: marked as done ($data->{subject})",
+ "Message-ID" => "<handler.$ref.$nn.ackdone\@$gEmailDomain>",
+ "In-Reply-To" => $header{'message-id'},
+ References => "$header{'message-id'} $data->{msgid}",
+ Precedence => 'bulk',
+ "X-$gProject-PR-Message" => "closed $ref",
+ "X-$gProject-PR-Package" => $data->{package},
+ "X-$gProject-PR-Keywords" => $data->{keywords}
+ ],<<END ,[$x,join("\n",@msg)]),'',[$replyto,@generalbcc,@noticecc],1);
Your message dated $header{'date'}
with message-id $header{'message-id'}
and subject line $subject
END
&htmllog("Notification","sent",$data->{originator},
"$gBug acknowledged by developer.");
- &sendmessage(<<END.join("\n",@msg),'');
-From: $gMaintainerEmail ($gProject $gBug Tracking System)
-To: $data->{originator}
-Subject: $gBug#$ref acknowledged by developer
- ($header{'subject'})
-Message-ID: <handler.$ref.$nn.notifdone\@$gEmailDomain>
-In-Reply-To: $data->{msgid}
-References: $header{'message-id'} $data->{msgid}
-X-$gProject-PR-Message: they-closed $ref
-X-$gProject-PR-Package: $data->{package}
-X-$gProject-PR-Keywords: $data->{keywords}
-Reply-To: $ref\@$gEmailDomain
-
+ &sendmessage(create_mime_message(
+ ["X-Loop" => "$gMaintainerEmail",
+ From => "$gMaintainerEmail ($gProject $gBug Tracking System)",
+ To => "$data->{originator}",
+ Subject => "$gBug#$ref closed by $markedby ($header{'subject'})",
+ "Message-ID" => "<handler.$ref.$nn.notifdone\@$gEmailDomain>",
+ "In-Reply-To" => "$data->{msgid}",
+ References => "$header{'message-id'} $data->{msgid}",
+ "X-$gProject-PR-Message" => "they-closed $ref",
+ "X-$gProject-PR-Package" => "$data->{package}",
+ "X-$gProject-PR-Keywords" => "$data->{keywords}",
+ "Reply-To" => "$ref\@$gEmailDomain",
+ "Content-Type" => 'text/plain; charset="utf-8"',
+ ],<<END ,[join("\n",@msg)]),'',undef,1);
This is an automatic notification regarding your $gBug report
#$ref: $data->{subject},
which was filed against the $data->{package} package.
-It has been closed by one of the developers, namely
-$markedby.
+It has been closed by $markedby.
Their explanation is attached below. If this explanation is
unsatisfactory and you have not received a better one in a separate
-message then please contact the developer, by replying to this email.
+message then please contact $markedby by replying
+to this email.
$gMaintainer
(administrator, $gProject $gBugs database)
$data->{package} = $pheader{package};
} else {
&htmllog("Warning","sent",$replyto,"Message not forwarded.");
- &sendmessage(<<END."---------------------------------------------------------------------------\n".join("\n", @msg), '');
-From: $gMaintainerEmail ($gProject $gBug Tracking System)
-To: $replyto
-Subject: Message with no Package: tag cannot be processed!
- ($subject)
-Message-ID: <handler.x.$nn.nonumnosub\@$gEmailDomain>
-In-Reply-To: $header{'message-id'}
-References: $header{'message-id'} $data->{msgid}
-Precedence: bulk
-X-$gProject-PR-Message: error
+ &sendmessage(create_mime_message(
+ ["X-Loop" => "$gMaintainerEmail",
+ From => "$gMaintainerEmail ($gProject $gBug Tracking System)",
+ To => $replyto,
+ Subject => "Message with no Package: tag cannot be processed! ($subject)",
+ "Message-ID" => "<handler.x.$nn.nonumnosub\@$gEmailDomain>",
+ "In-Reply-To" => $header{'message-id'},
+ References => "$header{'message-id'} $data->{msgid}",
+ Precedence => 'bulk',
+ "X-$gProject-PR-Message" => 'error'
+ ],<<END,[join("\n", @msg)]), '',undef,1);
Your message didn't have a Package: line at the start (in the
pseudo-header following the real mail header), or didn't have a
if (defined($pheader{owner})) {
$data->{owner}= $pheader{owner};
}
+ if (defined($pheader{forwarded})) {
+ $data->{'forwarded-to'} = $pheader{forwarded};
+ }
&filelock("nextnumber.lock");
open(N,"nextnumber") || &quit("nextnumber: read: $!");
$v=<N>; $v =~ s/\n$// || &quit("nextnumber bad format");
($veryquiet ?
"New $gBug report received and filed, but not forwarded." :
"New $gBug report received and forwarded."). $htmlbreak);
- &sendmessage($veryquiet ? <<END : $codeletter eq 'M' ? <<END : <<END,'');
-From: $gMaintainerEmail ($gProject $gBug Tracking System)
-To: $replyto
-Subject: $gBug#$ref: Acknowledgement of QUIET report
- ($subject)
-Message-ID: <handler.$ref.$nn.ackquiet\@$gEmailDomain>
-In-Reply-To: $header{'message-id'}
-References: $header{'message-id'}
-Precedence: bulk
-X-$gProject-PR-Message: ack-quiet $ref
-X-$gProject-PR-Package: $data->{package}
-X-$gProject-PR-Keywords: $data->{keywords}
-Reply-To: $ref-quiet\@$gEmailDomain
-
+ if ($veryquiet) {
+ &sendmessage(create_mime_message(
+ ["X-Loop" => "$gMaintainerEmail",
+ From => "$gMaintainerEmail ($gProject $gBug Tracking System)",
+ To => $replyto,
+ Subject => "$gBug#$ref: Acknowledgement of QUIET report ($subject)",
+ "Message-ID" => "<handler.$ref.$nn.ackquiet\@$gEmailDomain>",
+ "In-Reply-To" => $header{'message-id'},
+ References => $header{'message-id'},
+ Precedence => 'bulk',
+ "X-$gProject-PR-Message" => "ack-quiet $ref",
+ "X-$gProject-PR-Package" => $data->{package},
+ "X-$gProject-PR-Keywords" => $data->{keywords},
+ "Reply-To" => "$ref-quiet\@$gEmailDomain",
+ ],<<END,[join("\n", @msg)]), '',undef,1);
Thank you for the problem report you have sent regarding $gProject.
This is an automatically generated reply, to let you know your message
has been received. It has not been forwarded to the package maintainers
$gMaintainer
(administrator, $gProject $gBugs database)
END
-From: $gMaintainerEmail ($gProject $gBug Tracking System)
-To: $replyto
-Subject: $gBug#$ref: Acknowledgement of maintainer-only report
- ($subject)
-Message-ID: <handler.$ref.$nn.ackmaint\@$gEmailDomain>
-In-Reply-To: $header{'message-id'}
-References: $header{'message-id'}
-Precedence: bulk
-X-$gProject-PR-Message: ack-maintonly $ref
-X-$gProject-PR-Package: $data->{package}
-X-$gProject-PR-Keywords: $data->{keywords}
-Reply-To: $ref-maintonly\@$gEmailDomain
-
+ }
+ elsif ($codeletter eq 'M') {
+ &sendmessage(create_mime_message(
+ ["X-Loop" => "$gMaintainerEmail",
+ From => "$gMaintainerEmail ($gProject $gBug Tracking System)",
+ To => $replyto,
+ Subject => "$gBug#$ref: Acknowledgement of maintainer-only report ($subject)",
+ "Message-ID" => "<handler.$ref.$nn.ackmaint\@$gEmailDomain>",
+ "In-Reply-To" => $header{'message-id'},
+ References => $header{'message-id'},
+ Precedence => 'bulk',
+ "X-$gProject-PR-Message" => "ack-maintonly $ref",
+ "X-$gProject-PR-Package" => $data->{package},
+ "X-$gProject-PR-Keywords" => $data->{keywords},
+ "Reply-To" => "$ref-maintonly\@$gEmailDomain",
+ ],<<END,[]), '',undef,1);
Thank you for the problem report you have sent regarding $gProject.
This is an automatically generated reply, to let you know your message has
been received. It is being forwarded to the package maintainers (but not
$gMaintainer
(administrator, $gProject $gBugs database)
END
-From: $gMaintainerEmail ($gProject $gBug Tracking System)
-To: $replyto
-Subject: $gBug#$ref: Acknowledgement ($subject)
-Message-ID: <handler.$ref.$nn.ack\@$gEmailDomain>
-In-Reply-To: $header{'message-id'}
-References: $header{'message-id'}
-Precedence: bulk
-X-$gProject-PR-Message: ack $ref
-X-$gProject-PR-Package: $data->{package}
-X-$gProject-PR-Keywords: $data->{keywords}
-Reply-To: $ref\@$gEmailDomain
-
+ }
+ else {
+ &sendmessage(create_mime_message(
+ ["X-Loop" => "$gMaintainerEmail",
+ From => "$gMaintainerEmail ($gProject $gBug Tracking System)",
+ To => $replyto,
+ Subject => "$gBug#$ref: Acknowledgement ($subject)",
+ "Message-ID" => "<handler.$ref.$nn.ack\@$gEmailDomain>",
+ "In-Reply-To" => $header{'message-id'},
+ References => $header{'message-id'},
+ Precedence => 'bulk',
+ "X-$gProject-PR-Message" => "ack $ref",
+ "X-$gProject-PR-Package" => $data->{package},
+ "X-$gProject-PR-Keywords" => $data->{keywords},
+ "Reply-To" => "$ref\@$gEmailDomain",
+ ],<<END,[]), '',undef,1);
Thank you for the problem report you have sent regarding $gProject.
This is an automatically generated reply, to let you know your message has
been received. It is being forwarded to the package maintainers and other
$gMaintainer
(administrator, $gProject $gBugs database)
END
+ }
} elsif ($codeletter ne 'U' and
- $header{'precedence'} !~ /\b(?:bulk|junk|list)\b/) {
+ $header{'precedence'} !~ /\b(?:bulk|junk|list)\b/ and
+ # Workaround for gcc mail loops; bugzilla should do Precedence:
+ # instead. Deliberately not in CVS. - cjwatson
+ not exists $header{'x-bugzilla-reason'}) {
&htmllog("Acknowledgement","sent",$replyto,
($veryquiet ? "Extra info received and filed, but not forwarded." :
$codeletter eq 'M' ? "Extra info received and forwarded to maintainer." :
"Extra info received and forwarded to list."). $htmlbreak);
- &sendmessage($veryquiet ? <<END : $codeletter eq 'M' ? <<END : <<END,'');
-From: $gMaintainerEmail ($gProject $gBug Tracking System)
-To: $replyto
-Subject: $gBug#$ref: Info received and FILED only
- (was $subject)
-Message-ID: <handler.$ref.$nn.ackinfoquiet\@$gEmailDomain>
-In-Reply-To: $header{'message-id'}
-References: $header{'message-id'}
-Precedence: bulk
-X-$gProject-PR-Message: ack-info-quiet $ref
-X-$gProject-PR-Package: $data->{package}
-X-$gProject-PR-Keywords: $data->{keywords}
-Reply-To: $ref-quiet\@$gEmailDomain
-
+ if ($veryquiet) {
+ &sendmessage(create_mime_message(
+ ["X-Loop" => "$gMaintainerEmail",
+ From => "$gMaintainerEmail ($gProject $gBug Tracking System)",
+ To => $replyto,
+ Subject => "$gBug#$ref: Info received and FILED only (was $subject)",
+ "Message-ID" => "<handler.$ref.$nn.ackinfoquiet\@$gEmailDomain>",
+ "In-Reply-To" => $header{'message-id'},
+ References => $header{'message-id'},
+ Precedence => 'bulk',
+ "X-$gProject-PR-Message" => "ack-info-quiet $ref",
+ "X-$gProject-PR-Package" => $data->{package},
+ "X-$gProject-PR-Keywords" => $data->{keywords},
+ "Reply-To" => "$ref-maintonly\@$gEmailDomain",
+ ],<<END,[]), '',undef,1);
Thank you for the additional information you have supplied regarding
this problem report. It has NOT been forwarded to the package
maintainers, but will accompany the original report in the $gBug
$gMaintainer
(administrator, $gProject $gBugs database)
END
-From: $gMaintainerEmail ($gProject $gBug Tracking System)
-To: $replyto
-Subject: $gBug#$ref: Info received for maintainer only
- (was $subject)
-Message-ID: <handler.$ref.$nn.ackinfomaint\@$gEmailDomain>
-In-Reply-To: $header{'message-id'}
-References: $header{'message-id'}
-Precedence: bulk
-X-$gProject-PR-Message: ack-info-maintonly $ref
-X-$gProject-PR-Package: $data->{package}
-X-$gProject-PR-Keywords: $data->{keywords}
-Reply-To: $ref-maintonly\@$gEmailDomain
-
+ }
+ elsif ($codeletter eq 'M') {
+ &sendmessage(create_mime_message(
+ ["X-Loop" => "$gMaintainerEmail",
+ From => "$gMaintainerEmail ($gProject $gBug Tracking System)",
+ To => $replyto,
+ Subject => "$gBug#$ref: Info received for maintainer only (was $subject)",
+ "Message-ID" => "<handler.$ref.$nn.ackinfomaint\@$gEmailDomain>",
+ "In-Reply-To" => $header{'message-id'},
+ References => "$header{'message-id'} $data->{msgid}",
+ Precedence => 'bulk',
+ "X-$gProject-PR-Message" => "ack-info-maintonly $ref",
+ "X-$gProject-PR-Package" => $data->{package},
+ "X-$gProject-PR-Keywords" => $data->{keywords},
+ "Reply-To" => "$ref-maintonly\@$gEmailDomain",
+ ],<<END,[]), '',undef,1);
Thank you for the additional information you have supplied regarding
this problem report. It has been forwarded to the package maintainer(s)
(but not to other interested parties) to accompany the original report.
$gMaintainer
(administrator, $gProject $gBugs database)
END
-From: $gMaintainerEmail ($gProject $gBug Tracking System)
-To: $replyto
-Subject: $gBug#$ref: Info received (was $subject)
-Message-ID: <handler.$ref.$nn.ackinfo\@$gEmailDomain>
-In-Reply-To: $header{'message-id'}
-References: $header{'message-id'}
-Precedence: bulk
-X-$gProject-PR-Message: ack-info $ref
-X-$gProject-PR-Package: $data->{package}
-X-$gProject-PR-Keywords: $data->{keywords}
-
+ }
+ else {
+ &sendmessage(create_mime_message(
+ ["X-Loop" => "$gMaintainerEmail",
+ From => "$gMaintainerEmail ($gProject $gBug Tracking System)",
+ To => $replyto,
+ Subject => "$gBug#$ref: Info received ($subject)",
+ "Message-ID" => "<handler.$ref.$nn.ackinfo\@$gEmailDomain>",
+ "In-Reply-To" => $header{'message-id'},
+ References => "$header{'message-id'} $data->{msgid}",
+ Precedence => 'bulk',
+ "X-$gProject-PR-Message" => "ack-info $ref",
+ "X-$gProject-PR-Package" => $data->{package},
+ "X-$gProject-PR-Keywords" => $data->{keywords},
+ "Reply-To" => "$ref\@$gEmailDomain",
+ ],<<END,[]), '',undef,1);
Thank you for the additional information you have supplied regarding
this problem report. It has been forwarded to the package maintainer(s)
and to other interested parties to accompany the original report.
$gMaintainer
(administrator, $gProject $gBugs database)
END
-# Reply-To: in previous ack disabled by doogie due to mail loops.
-# Are these still a concern?
-# Reply-To: $ref\@$gEmailDomain
- }
+
+ }
+ }
}
&appendlog;
return $ret . $msg;
}
+=head2 send_message
+
+ send_message($the_message,\@recipients,\@bcc,$do_not_encode)
+
+The first argument is the scalar message, the second argument is the
+arrayref of recipients, the third is the arrayref of Bcc:'ed
+recipients.
+
+The final argument turns off header encoding and the addition of the
+X-Loop header if true, defaults to false.
+
+=cut
+
+
sub sendmessage {
- local ($msg,$recips,$bcc) = @_;
- if ((!ref($recips) && $recips eq '') || @$recips == 0) {
- $recips = ['-t'];
+ my ($msg,$recips,$bcc,$no_encode) = @_;
+ if (not defined $recips or (!ref($recips) && $recips eq '')
+ or @$recips == 0) {
+ $recips = ['-t'];
}
- $msg = "X-Loop: $gMaintainerEmail\n" . $msg;
+ # This is suboptimal. The right solution is to send headers
+ # separately from the rest of the message and encode them rather
+ # than doing this.
+ $msg = "X-Loop: $gMaintainerEmail\n" . $msg unless $no_encode;
# The original message received is written out in appendlog, so
# before writing out the other messages we've sent out, we need to
# RFC1522 encode the header.
- $msg = encode_headers($msg);
+ $msg = encode_headers($msg) unless $no_encode;
my $hash = get_hashname($ref);
#save email to the log
m/^\s*$/ && next;
m/^(\S+)\s+(\S.*\S)\s*\n$/ || &quit("maintainers bogus \`$_'");
$a= $1; $b= $2; $a =~ y/A-Z/a-z/;
- $maintainerof{$1}= $2;
+ # use the package which is normalized to lower case; we do this because we lc the pseudo headers.
+ $maintainerof{$a}= $2;
}
close(MAINT);
open(MAINT,"$gMaintainerFileOverride") || die &quit("maintainers.override open: $!");
m/^\s*$/ && next;
m/^(\S+)\s+(\S.*\S)\s*\n$/ || &quit("maintainers.override bogus \`$_'");
$a= $1; $b= $2; $a =~ y/A-Z/a-z/;
- $maintainerof{$1}= $2;
+ # use the package which is normalized to lower case; we do this because we lc the pseudo headers.
+ $maintainerof{$a}= $2;
}
close(MAINT);
open(SOURCES,"$gPackageSource") || &quit("pkgsrc open: $!");
print DEBUG "maintainer add >$p|$maintainerof{$p}<\n";
$addmaint= $maintainerof{$p};
push(@maintaddrs,$addmaint) unless
- ($addmaint eq $replyto and $codeletter ne 'M') ||
- grep($_ eq $addmaint, @maintaddrs);
+ $addmaint eq $replyto || grep($_ eq $addmaint, @maintaddrs);
$anymaintfound++;
} else {
print DEBUG "maintainer none >$p<\n";
$envelope_from =~ s/^.+?<([^>]+)>.+$/$1/;
}
my ($header,$body) = split /\n\n/, $bug_message, 2;
- # Add X-$gProject-PR-Message: list bug_number and package name headers
- if (defined $data and $bfound) {
- $header .= qq(\nX-$gProject-PR-Message: list $bug_number\n).
- qq(X-$gProject-PR-Package: $data->{package}\n).
- qq(X-$gProject-PR-Title: $data->{subject});
- }
- else {
- $header .= qq(\nX-$gProject-PR-Message: list inactivebug);
- }
+ # Add X-$gProject-PR-Message: list bug_number, package name, and bug title headers
+ $header .= qq(\nX-$gProject-PR-Message: list $bug_number\n).
+ qq(X-$gProject-PR-Package: $data->{package}\n).
+ qq(X-$gProject-PR-Title: $data->{subject})
+ if defined $data;
print STDERR "Tried to loop me with $envelope_from\n"
and exit 1 if $envelope_from =~ /\Q$gListDomain\E|\Q$gEmailDomain\E/;
print DEBUG $envelope_from,qq(\n);
projects / debbugs.git / blobdiff