merge changes from dla source tree

[debbugs.git] / Debbugs / Bugs.pm

diff --git a/Debbugs/Bugs.pm b/Debbugs/Bugs.pm
index e412b4769935fd3f10c3b38a0b53f4b4c8d872f4..e80a2bcc5043a4295c179f75e1ac371f7fdb2888 100644 (file)
--- a/Debbugs/Bugs.pm
+++ b/Debbugs/Bugs.pm
@@ -239,6 +239,9 @@ sub get_bugs_by_idx{
                                          archive   => {type => BOOLEAN,
                                                        default => 0,
                                                       },
+                                         owner     => {type => SCALAR|ARRAYREF,
+                                                       optional => 1,
+                                                      },
                                          src       => {type => SCALAR|ARRAYREF,
                                                        optional => 1,
                                                       },
@@ -366,7 +369,7 @@ sub get_bugs_flatfile{
      my @bugs;
      while (<$flatfile>) {
          next unless m/^(\S+)\s+(\d+)\s+(\d+)\s+(\S+)\s+\[\s*([^]]*)\s*\]\s+(\w+)\s+(.*)$/;
-         my ($pkg,$bug,$status,$submitter,$severity,$tags) = ($1,$2,$3,$4,$5,$6,$7);
+         my ($pkg,$bug,$time,$status,$submitter,$severity,$tags) = ($1,$2,$3,$4,$5,$6,$7);
          next if exists $param{bug} and not grep {$bug == $_} __make_list($param{bugs});
          if (exists $param{pkg}) {
               my @packages = splitpackages($pkg);
@@ -382,8 +385,8 @@ sub get_bugs_flatfile{
                             } @src_packages;
          }
          if (exists $param{submitter}) {
-              my @p_addrs = map {$_->address}
-                   map {lc(getparsedaddrs($_))}
+              my @p_addrs = map {lc($_->address)}
+                   map {getparsedaddrs($_)}
                         __make_list($param{submitter});
               my @f_addrs = map {$_->address}
                    getparsedaddrs($submitter||'');
@@ -445,7 +448,7 @@ sub __handle_pkg_src_and_maint{
          # We only want to increment the number of keys if there is
          # something to match
          my $key_inc = 0;
-         for my $package (map { getsrcpkgs($_)} __make_list($param{src})) {
+         for my $package ((map { getsrcpkgs($_)} __make_list($param{src})),__make_list($param{src})) {
               $packages{$package}++;
               $key_inc=1;
          }