merge changes from dla source branch

diff --git a/Debbugs/Common.pm b/Debbugs/Common.pm
index 915fa859a7f8bd290f6037d3c8b17ab3fa757cf7..283f33ef58a6b517d62ebf362f0ccfa9fefc3b86 100644 (file)
--- a/Debbugs/Common.pm
+++ b/Debbugs/Common.pm
@@ -869,6 +869,8 @@ sub cleanup_eval_fail {
     }
     # 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/\.+$/\./;

diff --git a/Debbugs/Control.pm b/Debbugs/Control.pm
index 4d44237aa8a0b93e0b8acc9eab7be892239ac700..5e39018fbf550520aea5ca5310f623b1e0f396a5 100644 (file)
--- a/Debbugs/Control.pm
+++ b/Debbugs/Control.pm
@@ -2075,7 +2075,7 @@ sub set_merged {
            # 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 @@ sub __calculate_merge_changes{
                 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;

diff --git a/scripts/service b/scripts/service
index 77b5ecae83627dc88bf0be2e3a693edd980bdeb1..98a9e11d62493365185814d8ef317264cc8aa049 100755 (executable)
--- a/scripts/service
+++ b/scripts/service
@@ -857,7 +857,7 @@ END
        };
        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 @@ END
        };
        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++;