fix logfh call

[debbugs.git] / scripts / process

diff --git a/scripts/process b/scripts/process
index 2ffbdf965424efae835c7d3980bacdd7e214a53c..4f7d15a8bfe25182df6bb13fe9f0163a59445f6f 100755 (executable)
--- a/scripts/process
+++ b/scripts/process
@@ -14,14 +14,14 @@ use IO::File;
 use MIME::Parser;
 use Debbugs::MIME qw(decode_rfc1522 create_mime_message getmailbody);
 use Debbugs::Mail qw(send_mail_message encode_headers get_addresses);
-use Debbugs::Packages qw(getpkgsrc binarytosource);
+use Debbugs::Packages qw(getpkgsrc binary_to_source);
 use Debbugs::User qw(read_usertags write_usertags);
 use Debbugs::Common qw(:lock get_hashname package_maintainer);
 use Debbugs::Status qw(writebug isstrongseverity lockreadbugmerge lockreadbug read_bug splitpackages :versions);
 
 use Debbugs::CGI qw(html_escape bug_url);
 
-use Debbugs::Log qw(:misc);
+use Debbugs::Log qw(:misc :write);
 
 use Debbugs::Text qw(:templates);
 
@@ -265,8 +265,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;
@@ -301,7 +300,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
@@ -512,6 +511,9 @@ if ($ref<0) { # new bug report
         $data->{package} = 'src:'.$pheader{source};
     } elsif (defined $pheader{package}) {
         $data->{package} = $pheader{package};
+       if ($data->{package} =~ /^src:(.+)/) {
+           $pheader{source} = $1;
+       }
     } elsif (defined $config{default_package}) {
        $data->{package} = $config{default_package},
     }
@@ -587,7 +589,7 @@ if ($ref<0) { # new bug report
         $data->{owner}= $pheader{owner};
     }
     if (defined($pheader{forwarded})) {
-       $data->{'forwarded-to'} = $pheader{forwarded};
+       $data->{forwarded} = $pheader{forwarded};
     }
     &filelock("nextnumber.lock");
     open(N,"nextnumber") || die "nextnumber: read: $!";
@@ -997,12 +999,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;
@@ -1078,7 +1082,9 @@ sub checkmaintainers {
        $p = $1;
        next unless defined $p;
        if (defined $gSubscriptionDomain) {
-           my @source = binarytosource($p);
+           my @source = binary_to_source(binary => $p,
+                                         source_only => 1,
+                                        );
            if (@source) {
                push @addsrcaddrs,
                    map {"$_\@$gSubscriptionDomain"} @source;