- Don't doubly select users

diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi
index 5a1d86b75a76997fccb4e114b0333eaddfa272e8..7f16855b704c739b1cfabac536a6f02f45897f36 100755 (executable)
--- a/cgi/pkgreport.cgi
+++ b/cgi/pkgreport.cgi
@@ -161,7 +161,7 @@ quitcgi("You have to choose something to select by") if (!$found);
 my %bugusertags;
 my %ut;
 for my $user (split /[\s*,]+/, $users) {
-    next unless ($user =~ m/..../);
+    next unless length($user) >= 4;
     add_user($user);
 }
 
@@ -206,10 +206,14 @@ set_option("use-bug-idx", defined($param{'use-bug-idx'}) ? $param{'use-bug-idx'}
 set_option("show_list_header", $show_list_header);
 set_option("show_list_footer", $show_list_footer);
 
+our %seen_users;
 sub add_user {
     my $ut = \%ut;
     my $u = shift;
 
+    return if $seen_users{$u};
+    $seen_users{$u} = 1;
+
     my $user = Debbugs::User::get_user($u);
 
     my %vis = map { $_, 1 } @{$user->{"visible_cats"}};

diff --git a/debian/changelog b/debian/changelog
index 10e060d9ad801afe86a1a6c5ae686c7ec863af31..44b9a2c9e8798e688b4805158b3f062f5227ba23 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -179,6 +179,7 @@ debbugs (2.4.2) UNRELEASED; urgency=low
     - Add PR-Package header for control messages (closes: #414023)
     - Fix double leading spaces of format=flowed messages
       (closes: #428056)
+    - Don't doubly select users
 
   
  -- Colin Watson <cjwatson@debian.org>  Fri, 20 Jun 2003 18:57:25 +0100