handle the request subject being undef

[debbugs.git] / Debbugs / Control.pm

diff --git a/Debbugs/Control.pm b/Debbugs/Control.pm
index 915b6749d93e48dbb182fda110adce7c9e97c8ff..c0c835bad98e0f4b85136f0647852fb2b4df4464 100644 (file)
--- a/Debbugs/Control.pm
+++ b/Debbugs/Control.pm
@@ -951,8 +951,8 @@ sub set_done {
        for my $data (@data) {
            my $old_data = dclone($data);
            my $hash = get_hashname($data->{bug_num});
-           my $report_fh = IO::File->new("db-h/$hash/$data->{bug_num}.report",'r') or
-               die "Unable to open original report db-h/$hash/$data->{bug_num}.report for reading: $!";
+           my $report_fh = IO::File->new("$config{spool_dir}/db-h/$hash/$data->{bug_num}.report",'r') or
+               die "Unable to open original report $config{spool_dir}/db-h/$hash/$data->{bug_num}.report for reading: $!";
            my $orig_report;
            {
                local $/;
@@ -996,7 +996,7 @@ sub set_done {
                                                             headers =>
                                                             [To => $data->{submitter},
                                                              Subject => "$config{ubug}#$data->{bug_num} ".
-                                                             "closed by $param{requester} ($param{request_subject})",
+                                                             "closed by $param{requester} ".(defined $param{request_subject}?"($param{request_subject})":""),
                                                             ],
                                                            )
                                            ],