Split source file properly

Thanks to James McCoy for the start of the patch

diff --git a/Debbugs/Control.pm b/Debbugs/Control.pm
index 8903ddefbaa76595534b1d8ebae355892a2255ba..2378ea1353cf7e19fe679685dde72d25187c85b8 100644 (file)
--- 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 dabf8112229f195c007c78e662b999ae9cc6e42b..9723259bdf482ce4b80ffcfb81d1ffe31d54334b 100644 (file)
--- 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 aae1b652ec18ce5ce8d51c8e670a3f76790d9d51..31158cb857f28cf8b38ef13335747d584e6cf0cf 100644 (file)
--- 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)