$tryref
.");
&sendmessage(create_mime_message(
[From => "$gMaintainerEmail ($gProject $gBug Tracking System)",
To => $replyto,
@@ -233,7 +243,8 @@ if ($tryref >= 0)
References => join(' ',grep {defined $_} $header{'message-id'},$data->{msgid}),
Precedence => 'bulk',
"X-$gProject-PR-Message" => 'error',
- ],message_body_template('process_unknown_bug_number',
+ @common_headers,
+ ],message_body_template('mail/process_unknown_bug_number',
{subject => $subject,
date => $header{date},
baddress => $baddress,
@@ -255,8 +266,7 @@ if (defined $pheader{source}) {
$source_package = $pheader{source};
}
elsif (defined $data->{package} or defined $pheader{package}) {
- my $pkg_src = getpkgsrc();
- $source_package = $pkg_src->{defined $data->{package}?$data->{package}:$pheader{package}};
+ $source_package = binary_to_source(binary => $data->{package} // $pheader{package});
}
$source_pr_header = "X-$gProject-PR-Source: $source_package\n"
if defined $source_package and length $source_package;
@@ -291,7 +301,7 @@ if ($codeletter eq 'D' || $codeletter eq 'F')
push @generalcc, "$gForwardList\@$gListDomain";
$generalcc= "$gForwardList\@$gListDomain";
} else {
- $generalcc='';
+ $generalcc='';
}
} else { # Done
if (defined $data->{done} and length($data->{done}) and
@@ -315,7 +325,6 @@ if ($codeletter eq 'D' || $codeletter eq 'F')
push @generalcc,"$gStrongList\@$gListDomain";
}
if ($ref<0) {
- &htmllog("Warning","sent",$replyto,"Message ignored.");
&sendmessage(create_mime_message(
[From => "$gMaintainerEmail ($gProject $gBug Tracking System)",
To => $replyto,
@@ -325,6 +334,7 @@ if ($codeletter eq 'D' || $codeletter eq 'F')
References => join(' ',grep {defined $_} $header{'message-id'},$data->{msgid}),
Precedence => 'bulk',
"X-$gProject-PR-Message" => 'error',
+ @common_headers,
],message_body_template('mail/process_no_bug_number',
{subject => $subject,
date => $header{date},
@@ -395,7 +405,7 @@ if ($codeletter eq 'D' || $codeletter eq 'F')
if ($codeletter eq 'F') {
&htmllog("Reply","sent",$replyto,"You have marked $gBug as forwarded.");
&sendmessage(create_mime_message(
- ["X-Loop" => "$gMaintainerEmail",
+ [@common_headers,
From => "$gMaintainerEmail ($gProject $gBug Tracking System)",
To => "$replyto",
Subject => "$gBug#$ref: marked as forwarded ($data->{subject})",
@@ -418,7 +428,7 @@ if ($codeletter eq 'D' || $codeletter eq 'F')
} else {
&htmllog("Reply","sent",$replyto,"You have taken responsibility.");
&sendmessage(create_mime_message(
- ["X-Loop" => "$gMaintainerEmail",
+ [@common_headers,
From => "$gMaintainerEmail ($gProject $gBug Tracking System)",
To => $replyto,
Subject => "$gBug#$ref: marked as done ($data->{subject})",
@@ -442,13 +452,13 @@ if ($codeletter eq 'D' || $codeletter eq 'F')
&htmllog("Notification","sent",$data->{originator},
"$gBug acknowledged by developer.");
&sendmessage(create_mime_message(
- ["X-Loop" => "$gMaintainerEmail",
+ [@common_headers,
From => "$gMaintainerEmail ($gProject $gBug Tracking System)",
To => "$data->{originator}",
Subject => "$gBug#$ref closed by $markedby ($header{'subject'})",
"Message-ID" => "$gBug#$ref
".
(length($data->{package})? "; Package ".html_escape($data->{package})."
" : '').
".");
- &sendmessage(<".html_escape($data->{package})."
" : '').
".");
}
- &sendmessage(<\n".html_escape($brokenness)."\n
\n" : '';
@@ -862,7 +886,7 @@ if (not exists $header{'x-debbugs-no-ack'} and
}
);
&sendmessage(create_mime_message(
- ["X-Loop" => "$gMaintainerEmail",
+ [@common_headers,
From => "$gMaintainerEmail ($gProject $gBug Tracking System)",
To => $replyto,
Subject => $t_h{subject},
@@ -882,14 +906,6 @@ if (not exists $header{'x-debbugs-no-ack'} and
&appendlog;
&finish;
-sub overwrite {
- my ($f,$v) = @_;
- open(NEW,">$f.new") || die "$f.new: create: $!";
- print(NEW "$v") || die "$f.new: write: $!";
- close(NEW) || die "$f.new: close: $!";
- rename("$f.new","$f") || die "rename $f.new to $f: $!";
-}
-
sub appendlog {
my $hash = get_hashname($ref);
if (!open(AP,">>db-h/$hash/$ref.log")) {
@@ -916,16 +932,14 @@ die "wot no exit";
sub htmllog {
my ($whatobj,$whatverb,$where,$desc) = @_;
- my $hash = get_hashname($ref);
- open(AP,">>db-h/$hash/$ref.log") || die "opening db-h/$hash/$ref.log (lh): $!";
- print(AP
- "\6\n".
- "$whatobj $whatverb".
- ($where eq '' ? "" : " to ".html_escape($where)."
").
- ":
\n". $desc.
- "\n\3\n") || die "writing db-h/$hash/$ref.log (lh): $!";
- close(AP) || die "closing db-h/$hash/$ref.log (lh): $!";
-}
+ append_action_to_log(bug => $ref,
+ action => "$whatobj $whatverb",
+ requester => '',
+ request_addr => $where,
+ desc => $desc,
+ get_lock => 0,
+ );
+}
sub stripbccs {
my $msg = shift;
@@ -982,12 +996,14 @@ sub sendmessage {
my $hash = get_hashname($ref);
#save email to the log
- open(AP,">>db-h/$hash/$ref.log") || die "opening db-h/$hash/$ref.log (lo): $!";
- print(AP "\2\n",join("\4",@$recips),"\n\5\n",
- escape_log(stripbccs($msg)),"\n\3\n") ||
- die "writing db-h/$hash/$ref.log (lo): $!";
- close(AP) || die "closing db-h/$hash/$ref.log (lo): $!";
-
+ my $logfh = IO::File->new(">>db-h/${hash}/${ref}.log") or
+ die "opening db-h/$hash/${ref}.log: $!";
+ write_log_records(logfh => $logfh,
+ records => {text => stripbccs($msg),
+ type => 'recips',
+ recips => [@{$recips}],
+ },
+ );
if (ref($bcc)) {
shift @$recips if $recips->[0] eq '-t';
push @$recips, @$bcc;
@@ -1050,57 +1066,38 @@ sub fill_template{
}
+# this shole routine is *bad*; will be changed to use
+# Debbugs::Recipients and stuff therin in short order.
sub checkmaintainers {
return if $maintainerschecked++;
return if !length($data->{package});
- my %maintainerof;
- open(MAINT,"$gMaintainerFile") || die die "maintainers open: $!";
- while (