From 7c98c4f499ca7d51cee2f3f5ce2d3337cb1b42ca Mon Sep 17 00:00:00 2001 From: Don Armstrong Date: Thu, 30 Mar 2017 19:25:55 -0700 Subject: [PATCH] Split source file properly Thanks to James McCoy for the start of the patch --- Debbugs/Control.pm | 2 +- Debbugs/Status.pm | 4 ++-- debian/changelog | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Debbugs/Control.pm b/Debbugs/Control.pm index 8903dde..2378ea1 100644 --- a/Debbugs/Control.pm +++ b/Debbugs/Control.pm @@ -3792,7 +3792,7 @@ LIMIT: for my $limit (make_list($param{limit}{$field})) { } if (not $match) { $going_to_fail = 1; - print {$transcript} qq($field: ).join(', ',map{qq("$_")} make_list($data->{$field})). + print {$transcript} qq($field: ').join(', ',map{qq("$_")} make_list($data->{$field})). "' does not match at least one of ". join(', ',map {ref($_)?'(regex)':qq("$_")} make_list($param{limit}{$field}))."\n"; } diff --git a/Debbugs/Status.pm b/Debbugs/Status.pm index dabf811..9723259 100644 --- a/Debbugs/Status.pm +++ b/Debbugs/Status.pm @@ -1235,9 +1235,9 @@ sub get_bug_status { $status{package} = '' if not defined $status{package}; $status{"package"} =~ s/\s*$//; - $status{source} = binary_to_source(binary=>[split /\s*,\s*/, $status{package}], + $status{source} = [binary_to_source(binary=>[split /\s*,\s*/, $status{package}], source_only => 1, - ); + )]; $status{"package"} = 'unknown' if ($status{"package"} eq ''); $status{"severity"} = 'normal' if (not defined $status{severity} or $status{"severity"} eq ''); diff --git a/debian/changelog b/debian/changelog index aae1b65..31158cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -43,6 +43,7 @@ debbugs (2.6.0~exp1) UNRELEASED; urgency=low * Use a supported version of debhelper and switch to dh $@ style rules (Closes: #800287) * debbugs-web now Breaks/Replaces debbugs (<< 2.4.2) (Closes: #717967) + * Split source file properly (Closes: #858671). Thanks to James McCoy. [ Niels Thykier ] * quitcgi() now returns 400/500 status codes instead of 200 (Closes: #584922) -- 2.39.2