merge changes from don source

diff --git a/Debbugs/Control.pm b/Debbugs/Control.pm
index 136a6dc54462719e67641361dcd961889463f764..ac0e0e3bf105fbe7635cef8211fe4c43fe8d383a 100644 (file)
--- a/Debbugs/Control.pm
+++ b/Debbugs/Control.pm
@@ -482,8 +482,9 @@ sub set_blocks {
            for my $data (@blocking_data) {
                my $old_data = dclone($data);
                my %blocks;
-               %blocks = split ' ', $data->{blocks};
-               my @blocks;
+               my @blocks = split ' ', $data->{blocks};
+               @blocks{@blocks} = (1) x @blocks;
+               @blocks = ();
                for my $bug (@bugs) {
                    if ($add_remove eq 'remove') {
                        next unless exists $blocks{$bug};
@@ -1817,7 +1818,7 @@ sub affects {
              }
              if (keys %added_packages) {
                  $action .= "Added indication that $data->{bug_num} affects " .
-                  english_join([%added_packages]);
+                  english_join([keys %added_packages]);
              }
         }
        if (not length $action) {

diff --git a/scripts/service b/scripts/service
index 44563b6d652416bb0000571187fda2a6f893e9bf..429a7cde985d9222df62d5bb46ea267e9909e1df 100755 (executable)
--- a/scripts/service
+++ b/scripts/service
@@ -567,7 +567,8 @@ END
     } elsif (m/^reopen\s+\#?(-?\d+)(?:\s+([\=\!]|(?:\S.*\S)))?$/i) {
         $ok++;
         $ref= $1;
-       $bug_affected{$ref}=1; 
+       $ref = $clonebugs{$ref} if exists $clonebugs{$ref};
+       $bug_affected{$ref}=1;
        my $new_submitter = $2;
        if (defined $new_submitter) {
            if ($new_submitter eq '=') {

diff --git a/t/06_mail_handling.t b/t/06_mail_handling.t
index 0ae5d0afac26ff1ebea92fcf79f6f463df8afdb0..8285792260cdbfee8cd45602f6f39ada2b9e8610 100644 (file)
--- a/t/06_mail_handling.t
+++ b/t/06_mail_handling.t
@@ -1,7 +1,7 @@
 # -*- mode: cperl;-*-
 # $Id: 05_mail.t,v 1.1 2005/08/17 21:46:17 don Exp $
 
-use Test::More tests => 111;
+use Test::More tests => 114;
 
 use warnings;
 use strict;
@@ -243,6 +243,11 @@ my @control_commands =
                       status_key => 'blockedby',
                       status_value => '2',
                      },
+      unblock      => {command => 'unblock',
+                      value   => ' with 2',
+                      status_key => 'blockedby',
+                      status_value => '',
+                     },
       summary      => {command => 'summary',
                       value   => '5',
                       status_key => 'summary',