From: cjwatson <>
Date: Fri, 29 Jul 2005 23:53:38 +0000 (-0800)
Subject: [project @ 2005-07-29 16:53:38 by cjwatson]
X-Git-Tag: release/2.6.0~673
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=97ccd8e3b9791ae017fd8697ffb7c27e350d2991;p=debbugs.git

[project @ 2005-07-29 16:53:38 by cjwatson]
Improve version canonicalisation when removing found/fixed versions (as
well as when adding them).
---

diff --git a/scripts/errorlib.in b/scripts/errorlib.in
index 78ee2aba..9143cfe2 100755
--- a/scripts/errorlib.in
+++ b/scripts/errorlib.in
@@ -1,5 +1,5 @@
 # -*- perl -*-
-# $Id: errorlib.in,v 1.48 2005/07/24 17:39:09 cjwatson Exp $
+# $Id: errorlib.in,v 1.49 2005/07/29 16:53:38 cjwatson Exp $
 
 use Mail::Address;
 use Debbugs::MIME qw(decode_rfc1522 encode_rfc1522);
@@ -298,10 +298,22 @@ sub addfoundversions {
 
 sub removefoundversions {
     my $data = shift;
-    my $source = shift;
+    my $package = shift;
     my $version = shift;
+    my $isbinary = shift;
     return unless defined $version;
-    undef $source if $source =~ m[(?:\s|/)];
+    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.
+            removefoundversions($data, $_->[0], $_->[1], '') foreach @srcinfo;
+            return;
+        }
+        # Otherwise, an unqualified version will have to do.
+    }
 
     foreach my $ver (split /[,\s]+/, $version) {
         my $sver = defined($source) ? "$source/$ver" : '';
@@ -346,10 +358,22 @@ sub addfixedversions {
 
 sub removefixedversions {
     my $data = shift;
-    my $source = shift;
+    my $package = shift;
     my $version = shift;
+    my $isbinary = shift;
     return unless defined $version;
-    undef $source if $source =~ m[(?:\s|/)];
+    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.
+    }
 
     foreach my $ver (split /[,\s]+/, $version) {
         my $sver = defined($source) ? "$source/$ver" : '';