X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Debbugs%2FStatus.pm;h=9723259bdf482ce4b80ffcfb81d1ffe31d54334b;hb=7c98c4f499ca7d51cee2f3f5ce2d3337cb1b42ca;hp=b28ff5355658e4a24dc17bc29bc06da172334e39;hpb=d4b9a1bfe03c6ec1451c8f9178bb5a7458e9ae3e;p=debbugs.git

diff --git a/Debbugs/Status.pm b/Debbugs/Status.pm
index b28ff53..9723259 100644
--- a/Debbugs/Status.pm
+++ b/Debbugs/Status.pm
@@ -34,7 +34,7 @@ use warnings;
 use strict;
 
 use vars qw($VERSION $DEBUG %EXPORT_TAGS @EXPORT_OK @EXPORT);
-use base qw(Exporter);
+use Exporter qw(import);
 
 use Params::Validate qw(validate_with :types);
 use Debbugs::Common qw(:util :lock :quit :misc);
@@ -270,7 +270,7 @@ sub read_bug{
 	 # create the found/fixed hashes which indicate when a
 	 # particular version was marked found or marked fixed.
 	 @{$data{$field}}{@{$data{"${field}_versions"}}} =
-	      (('') x (@{$data{"${field}_date"}} - @{$data{"${field}_versions"}}),
+	      (('') x (@{$data{"${field}_versions"}} - @{$data{"${field}_date"}}),
 	       @{$data{"${field}_date"}});
     }
 
@@ -416,7 +416,6 @@ data.
 =cut
 
 sub lockreadbugmerge {
-     my ($bug_num,$location) = @_;
      my $data = lockreadbug(@_);
      if (not defined $data) {
 	  return (0,undef);
@@ -732,9 +731,9 @@ sub addfoundversions {
     my $version = shift;
     my $isbinary = shift;
     return unless defined $version;
-    undef $package if $package =~ m[(?:\s|/)];
+    undef $package if defined $package and $package =~ m[(?:\s|/)];
     my $source = $package;
-    if ($package =~ s/^src://) {
+    if (defined $package and $package =~ s/^src://) {
 	$isbinary = 0;
 	$source = $package;
     }
@@ -1236,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 '');