From: Don Armstrong <don@donarmstrong.com>
Date: Thu, 14 Mar 2013 15:33:30 +0000 (-0700)
Subject: Merge branch 'master' into don/fix_encoding
X-Git-Tag: release/2.6.0~312^2~5
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4a33202f6e53ef347c9c1b5565d8902c4bc60fee;hp=03115a2dbff942931b91ff106865a935de17db8e;p=debbugs.git

Merge branch 'master' into don/fix_encoding
---

diff --git a/Debbugs/Control.pm b/Debbugs/Control.pm
index 44463ba..9587624 100644
--- a/Debbugs/Control.pm
+++ b/Debbugs/Control.pm
@@ -1579,7 +1579,11 @@ sub set_found {
 		if (not @svers) {
 		    @svers = $version;
 		}
-		else {
+		elsif (not grep {$version eq $_} @svers) {
+                    # The $version was not equal to one of the source
+                    # versions, so it's probably unqualified (or just
+                    # wrong). Delete it, and use the source versions
+                    # instead.
 		    if (exists $found_versions{$version}) {
 			delete $found_versions{$version};
 			$found_removed{$version} = 1;