X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Debbugs%2FControl.pm;h=631504a8d5420a24db292d736732201a3ad9113b;hb=4b9aa4ca12ea837fb4975115e7d7de720f8b9427;hp=915b6749d93e48dbb182fda110adce7c9e97c8ff;hpb=8bf314b5bb3d6c96735b221083037dc035196a89;p=debbugs.git

diff --git a/Debbugs/Control.pm b/Debbugs/Control.pm
index 915b674..631504a 100644
--- 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})":""),
 							     ],
 							    )
 					    ],
@@ -2898,7 +2898,7 @@ sub clone_bug {
     for my $bug (split ' ', $data->{blocks}) {
 	for my $new_bug (@new_bugs) {
 	    set_blocks(bug => $new_bug,
-		       blocks => $bug,
+		       block => $bug,
 		       hash_slice(%param,
 				  keys %common_options,
 				  keys %append_action_options),
@@ -2909,7 +2909,7 @@ sub clone_bug {
     for my $bug (split ' ', $data->{blockedby}) {
 	for my $new_bug (@new_bugs) {
 	    set_blocks(bug => $bug,
-		       blocks => $new_bug,
+		       block => $new_bug,
 		       hash_slice(%param,
 				  keys %common_options,
 				  keys %append_action_options),