Package member key is the fully-qualified name; fix error in get

[debbugs.git] / Debbugs / Control.pm

diff --git a/Debbugs/Control.pm b/Debbugs/Control.pm
index 20f82dfc2741e1d527b89cb330dcbb2dc0a13b6c..1f8b3aac60d3cb98fe5264795fc7806e795c4bac 100644 (file)
--- a/Debbugs/Control.pm
+++ b/Debbugs/Control.pm
@@ -364,7 +364,7 @@ sub set_blocks {
        next if $ok_blockers{$blocker} or $bad_blockers{$blocker};
        my $data = read_bug(bug=>$blocker,
                           );
-       if (defined $data and not $data->{archive}) {
+       if (defined $data and not $data->{archived}) {
            $data = split_status_fields($data);
            $ok_blockers{$blocker} = 1;
            my @merged_bugs;
@@ -380,8 +380,8 @@ sub set_blocks {
     # blocker
     if (keys %bad_blockers and $mode eq 'set') {
        __end_control(%info);
-       croak "Unknown blocking bug(s):".join(', ',keys %bad_blockers).
-           keys %ok_blockers?'':" and no known blocking bug(s)";
+       croak "Unknown/archived blocking bug(s):".join(', ',keys %bad_blockers).
+           keys %ok_blockers?'':" and no good blocking bug(s)";
     }
     # if there are no ok blockers and we are not setting the blockers,
     # there's an error.
@@ -389,7 +389,7 @@ sub set_blocks {
        print {$transcript} "No valid blocking bug(s) given; not doing anything\n";
        if (keys %bad_blockers) {
            __end_control(%info);
-           croak "Unknown blocking bug(s):".join(', ',keys %bad_blockers);
+           croak "Unknown/archived blocking bug(s):".join(', ',keys %bad_blockers);
        }
        __end_control(%info);
        return;
@@ -2089,6 +2089,7 @@ sub set_merged {
                $param{show_bug_info} and not __internal_request(1);
            $bug_info_shown{$change_bug} = 1;
            __allow_relocking($param{locks},[keys %data]);
+           eval {
            for my $change (@{$changes->{$change_bug}}) {
                if ($change->{field} eq 'blockedby' or $change->{field} eq 'blocks') {
                    my %target_blockedby;
@@ -2125,6 +2126,12 @@ sub set_merged {
                                         );
                }
            }
+       };
+           if ($@) {
+               __disallow_relocking($param{locks});
+               __end_control(%info);
+               croak "Failure while trying to adjust bugs, please report this as a bug: $@";
+           }
            __disallow_relocking($param{locks});
            my ($data,$n_locks) =
                __lock_and_load_merged_bugs(bugs_to_load => [keys %merging],
@@ -2291,13 +2298,22 @@ sub __calculate_merge_status{
            $merged_bugs{$data->{bug_num}} = 1;
            $bugs_to_merge = 1;
        }
+    }
+    for my $data (@{$data_a}) {
        # the master_bug is the bug that every other bug is made to
        # look like. However, if merge is set, tags, fixed and found
        # are merged.
        if ($data->{bug_num} == $master_bug) {
-           for (qw(package forwarded severity blocks blockedby done owner summary outlook affects)) {
+           for (qw(package forwarded severity done owner summary outlook affects)) {
                $merge_status{$_} = $data->{$_}
            }
+           # bugs which are in the newly merged set and are also
+           # blocks/blockedby must be removed before merging
+           for (qw(blocks blockedby)) {
+               $merge_status{$_} =
+                   join(' ',grep {not exists $merged_bugs{$_}}
+                        split / /,$data->{$_});
+           }
        }
        if (defined $merge_status) {
            next unless $data->{bug_num} == $master_bug;
@@ -2775,7 +2791,8 @@ sub _summary {
                                 \#|reopen|close|(?:not|)(?:fixed|found)|clone|
                                 debug|(?:not|)forwarded|priority|
                                 (?:un|)block|limit|(?:un|)archive|
-                                reassign|retitle|affects|wrongpackage
+                                reassign|retitle|affects|package|
+                                outlook|
                                 (?:un|force|)merge|user(?:category|tags?|)
                             )\s+\S}xis) {
                   if (not length $paragraph) {
@@ -3229,6 +3246,15 @@ sub bug_unarchive {
      my @bugs = @{$info{bugs}};
      my $action = "$config{bug} unarchived.";
      my @files_to_remove;
+     ## error out if we're unarchiving unarchived bugs
+     for my $data (@{$info{data}}) {
+        if (not defined $data->{archived} or
+            not $data->{archived}
+           ) {
+            __end_control(%info);
+            croak("Bug $data->{bug_num} was not archived; not unarchiving it.");
+        }
+     }
      for my $bug (@bugs) {
          print {$debug} "$param{bug} removing $bug\n";
          my $dir = get_hashname($bug);