Commit to mainline by don@debian.org -- merge changes from dla source branch

[Debbugs Maintainers]

------------------------------------------------------------
revno: 932 [merge]
committer: Debian BTS <debbugs@busoni>
branch nick: mainline
timestamp: Mon 2012-03-19 21:36:04 +0000
message:
  merge changes from dla source branch
------------------------------------------------------------
Use --include-merges or -n0 to see merged revisions.

=== modified file 'Debbugs/Common.pm'
--- Debbugs/Common.pm   2012-03-13 05:29:45 +0000
+++ Debbugs/Common.pm   2012-03-19 21:35:51 +0000
@@ -869,6 +869,8 @@
     }
     # ditch the "at foo/bar/baz.pm line 5"
     $error =~ s/\sat\s\S+\sline\s\d+//;
+    # ditch croak messages
+    $error =~ s/^\s{3,}.+//g;
     # ditch trailing multiple periods in case there was a cascade of
     # die messages.
     $error =~ s/\.+$/\./;

=== modified file 'Debbugs/Control.pm'
--- Debbugs/Control.pm  2012-03-19 18:53:55 +0000
+++ Debbugs/Control.pm  2012-03-19 21:35:51 +0000
@@ -2075,7 +2075,7 @@
            # figure out the problems
            print {$transcript} "Unable to merge bugs because:\n";
            for my $change (@{$disallowed_changes}) {
-               print {$transcript} "$change->{field} of #$change->{bug} is 
'$change->{orig_value}' not '$change->{value}'\n";
+               print {$transcript} "$change->{field} of #$change->{bug} is 
'$change->{text_orig_value}' not '$change->{text_value}'\n";
            }
            if ($attempts > 0) {
                croak "Some bugs were altered while attempting to merge";
@@ -2410,6 +2410,8 @@
                 options  => $force_functions{$field}{options},
                 allowed  => exists $force_functions{$field}{allowed} ? 0 : 
$force_functions{$field}{allowed},
                };
+           $change->{text_value} = ref($change->{func_value}) eq 
'ARRAY'?join(' ',@{$change->{func_value}}):$change->{func_value};
+           $change->{text_orig_value} = ref($change->{orig_value}) eq 
'ARRAY'?join(' ',@{$change->{orig_value}}):$change->{orig_value};
            if ($param->{force}) {
                if ($field ne 'package') {
                    push @{$changes{$data->{bug_num}}},$change;

=== modified file 'scripts/service'
--- scripts/service     2012-03-19 17:44:49 +0000
+++ scripts/service     2012-03-19 21:35:51 +0000
@@ -857,7 +857,7 @@
        };
        if ($@) {
            $errors++;
-           print {$transcript} "Failed to unmerge $ref: 
$@".cleanup_eval_fail($@,$debug)."\n";
+           print {$transcript} "Failed to unmerge $ref: 
".cleanup_eval_fail($@,$debug)."\n";
        }
     } elsif (m/^merge\s+#?(-?\d+(\s+#?-?\d+)+)\s*$/i) {
        $ok++;
@@ -872,7 +872,7 @@
        };
        if ($@) {
            $errors++;
-           print {$transcript} "Failed to merge $ref: 
$@".cleanup_eval_fail($@,$debug)."\n";
+           print {$transcript} "Failed to merge $ref: 
".cleanup_eval_fail($@,$debug)."\n";
        }
     } elsif (m/^forcemerge\s+\#?(-?\d+(?:\s+\#?-?\d+)+)\s*$/i) {
        $ok++;