merge changes from dla source branch

diff --git a/Debbugs/SOAP.pm b/Debbugs/SOAP.pm
index 4a96b22cd6e13cc6cab873effc628be9aec3f345..ed669a125f64d9c6768efedf6caa8327f384250f 100644 (file)
--- a/Debbugs/SOAP.pm
+++ b/Debbugs/SOAP.pm
@@ -52,10 +52,13 @@ our %DEBBUGS_SOAP_COOKIES;
 =head2 get_usertag
 
      my %ut = get_usertag('don@donarmstrong.com','this-bug-sucks','eat-this-bug');
+     my %ut = get_usertag('don@donarmstrong.com');
 
 Returns a hashref of bugs which have the specified usertags for the
 user set.
 
+In the second case, returns all of the usertags for the user passed.
+
 =cut
 
 use Debbugs::User qw(read_usertags);

diff --git a/Debbugs/Status.pm b/Debbugs/Status.pm
index 6c44823a0d11bc32593b2a746a719e2f4fd28e2d..b4baa4842c513098ae35f71f58adb745c4247639 100644 (file)
--- a/Debbugs/Status.pm
+++ b/Debbugs/Status.pm
@@ -529,24 +529,20 @@ sub removefixedversions {
     my $version = shift;
     my $isbinary = shift;
     return unless defined $version;
-    undef $package if $package =~ m[(?:\s|/)];
-    my $source = $package;
-
-    if (defined $package and $isbinary) {
-        my @srcinfo = binarytosource($package, $version, undef);
-        if (@srcinfo) {
-            # We know the source package(s). Use a fully-qualified version.
-            removefixedversions($data, $_->[0], $_->[1], '') foreach @srcinfo;
-            return;
-        }
-        # Otherwise, an unqualified version will have to do.
-        undef $source;
-    }
 
     foreach my $ver (split /[,\s]+/, $version) {
-        my $sver = defined($source) ? "$source/$ver" : '';
-        @{$data->{fixed_versions}} =
-            grep { $_ ne $ver and $_ ne $sver } @{$data->{fixed_versions}};
+        if ($ver =~ m{/}) {
+             # fully qualified version
+             @{$data->{fixed_versions}} =
+                  grep {$_ ne $ver}
+                       @{$data->{fixed_versions}};
+        }
+        else {
+             # non qualified version; delete all matchers
+             @{$data->{fixed_versions}} =
+                  grep {$_ !~ m[(?:^|/)\Q$ver\E$]}
+                       @{$data->{fixed_versions}};
+        }
     }
 }
 

diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi
index 64547d40a1eceaeb51daa521002b93113c3f1223..5b46729639605ba74a0b941b3374d2cd46bd3b78 100755 (executable)
--- a/cgi/bugreport.cgi
+++ b/cgi/bugreport.cgi
@@ -475,8 +475,10 @@ sub handle_record{
          }
          # Incomming Mail Message
          my ($received,$hostname) = $record->{text} =~ m/Received: \(at (\S+)\) by (\S+)\;/;
-         $output .= qq|<hr><p class="msgreceived"><a name="$msg_number"></a><a name="msg$msg_number">Message received</a> at |.
-              html_escape("$received\@$hostname") . q| (<a href="| . bug_url($ref, msg=>$msg_number) . '">full text</a>'.q|, <a href="| . bug_url($ref, msg=>$msg_number,mbox=>'yes') .'">mbox</a>)'.":</p>\n";
+         $output .= qq|<hr><p class="msgreceived"><a name="$msg_number"></a><a name="msg$msg_number"></a><a href="#$msg_number">Message</a> received at |.
+              html_escape("$received\@$hostname") .
+                   q| (<a href="| . bug_url($ref, msg=>$msg_number) . '">full text</a>'.
+                        q|, <a href="| . bug_url($ref, msg=>$msg_number,mbox=>'yes') .'">mbox</a>)'.":</p>\n";
          $output .= handle_email_message($record->{text},
                                    ref        => $bug_number,
                                    msg_number => $msg_number,

diff --git a/debian/changelog b/debian/changelog
index 42889f0dd00f3cc72719d4c8b8b5d8e4d30d7cff..53b2b7304cdf207b9efbc9599cf4aeb9b4067c1e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -196,6 +196,8 @@ debbugs (2.4.2) UNRELEASED; urgency=low
     - Allow selecting both archived and unarchived bugs (closes: #320175)
     - Support intersecting sets of bugs (closes: #164421)
     - Allow selecting the newest N bugs (closes: #84681)
+    - Add anchor links to specific messages (closes: #431450)
+    - Add missing newline after indicating what the user is (closes: #432466)
 
   
  -- Colin Watson <cjwatson@debian.org>  Fri, 20 Jun 2003 18:57:25 +0100

diff --git a/scripts/service.in b/scripts/service.in
index acf5bfa1131f8afb2642936fa0c9655f949554ed..3c1ed180414cafeb83225eecdaa6c4795b7b415c 100755 (executable)
--- a/scripts/service.in
+++ b/scripts/service.in
@@ -286,7 +286,7 @@ END
            next;
         }
        if (not $indicated_user and defined $user) {
-            &transcript("User is $user");
+            &transcript("User is $user\n");
             $indicated_user = 1;
        }
        while (++$procline <= $#bodylines) {
@@ -373,7 +373,7 @@ END
            $indicated_user = 1;
         } elsif (&setbug) {
            if (not $indicated_user and defined $user) {
-                &transcript("User is $user");
+                &transcript("User is $user\n");
                 $indicated_user = 1;
            }
            &nochangebug;

diff --git a/t/03_versions.t b/t/03_versions.t
index 1a9af80905b557bfdaf4496ba77d93e117c1c5f7..3a7beb44dfae90bf620f3e626086bb9fb0f27ccf 100644 (file)
--- a/t/03_versions.t
+++ b/t/03_versions.t
@@ -1,6 +1,6 @@
 # -*- mode: cperl;-*-
 
-use Test::More tests => 3;
+use Test::More tests => 5;
 
 use warnings;
 use strict;
@@ -28,3 +28,11 @@ is_deeply($data->{found_versions},['1.34'],'removefoundversions removes all 1.00
 $data = dclone(\%data);
 removefoundversions($data,$data->{package},'bar/1.00');
 is_deeply($data->{found_versions},['1.00','1.34'],'removefoundversions removes only bar/1.00 versions');
+$data = dclone(\%data);
+addfoundversions($data,$data->{package},'1.45');
+is_deeply($data->{fixed_versions},['bar/1.02'],'addfoundversions removes fixed versions');
+is_deeply($data->{found_versions},['bar/1.00',
+                                  '1.00',
+                                  '1.34',
+                                  'foo/1.45',
+                                 ],,'addfoundversions adds found versions');