always return an arrayref in split_fields

[debbugs.git] / Debbugs / Status.pm

diff --git a/Debbugs/Status.pm b/Debbugs/Status.pm
index 382ada06b8ec2135617e262934359f291932cd90..6e21f99cff7ee3de8ec61aa5513cfc2222db1dd6 100644 (file)
--- a/Debbugs/Status.pm
+++ b/Debbugs/Status.pm
@@ -291,10 +291,10 @@ my %split_fields =
      affects        => \&splitpackages,
      blocks         => $ditch_empty_space,
      blockedby      => $ditch_empty_space,
-     tags           => sub {return &{$ditch_empty}(qr/\s*\,\s*/,@_)},
+     tags           => $ditch_empty_space,
      found_versions => $ditch_empty_space,
      fixed_versions => $ditch_empty_space,
-     merged_with    => $ditch_empty_space,
+     mergedwith     => $ditch_empty_space,
     );
 
 sub split_status_fields {
@@ -316,12 +316,7 @@ sub split_status_fields {
                      ) {
                    @elements = split $split_fields{$field}, $data->{$field};
                }
-               if (@elements != 1) {
-                   $data->{$field} = \@elements;
-               }
-               else {
-                   $data->{$field} = $elements[0];
-               }
+               $data->{$field} = \@elements;
            }
        }
     }
@@ -347,22 +342,22 @@ sub join_status_fields {
         affects        => ', ',
         blocks         => ' ',
         blockedby      => ' ',
-        tags           => ', ',
+        tags           => ' ',
         found_versions => ' ',
         fixed_versions => ' ',
         found_date     => ' ',
         fixed_date     => ' ',
-        merged_with    => ' ',
+        mergedwith     => ' ',
        );
-    my @data = dclone(\@_);
+    my @data = @{dclone(\@_)};
     for my $data (@data) {
        next if not defined $data;
-       croak "Passed an element which is not a hashref to split_status_field" if
-           not (defined ref($data) and ref($data) eq 'HASH');
+       croak "Passed an element which is not a hashref to split_status_field: ".
+           ref($data)
+               if ref($data) ne 'HASH';
        for my $field (keys %{$data}) {
            next unless defined $data->{$field};
-           next unless defined(ref($data->{$field}))
-               and ref($data->{$field}) eq 'ARRAY';
+           next unless ref($data->{$field}) eq 'ARRAY';
            next unless exists $join_fields{$field};
            $data->{$field} = join($join_fields{$field},@{$data->{$field}});
        }
@@ -516,9 +511,6 @@ sub makestatus {
         }
     }
     %newdata = %{join_status_fields(\%newdata)};
-    for my $field (qw(found_versions fixed_versions found_date fixed_date)) {
-        $newdata{$field} = join ' ', @{$newdata{$field}||[]};
-    }
 
     if ($version < 3) {
         for my $field (@rfc1522_fields) {