From b589eb07e8c620e6daa2ac0dcd65f7d68f242814 Mon Sep 17 00:00:00 2001
From: Don Armstrong <don@donarmstrong.com>
Date: Thu, 8 Nov 2012 14:38:28 -0800
Subject: [PATCH] if there is a non-source qualified version with a
corresponding source qualified version, we only want to merge the source
qualified version(s)
This fixes #670456
---
Debbugs/Control.pm | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/Debbugs/Control.pm b/Debbugs/Control.pm
index 74653b0a..39e6648b 100644
--- a/Debbugs/Control.pm
+++ b/Debbugs/Control.pm
@@ -2319,6 +2319,17 @@ sub __calculate_merge_status{
@{$merge_status{"${_}_versions"}}{@{$data->{"${_}_versions"}}} = (1) x @{$data->{"${_}_versions"}};
}
}
+ # if there is a non-source qualified version with a corresponding
+ # source qualified version, we only want to merge the source
+ # qualified version(s)
+ for (qw(fixed found)) {
+ my @unqualified_versions = grep {m{/}?0:1} keys %{$merge_status{"${_}_versions"}};
+ for my $unqualified_version (@unqualified_versions) {
+ if (grep {m{/\Q$unqualified_version\E}} keys %{$merge_status{"${_}_versions"}}) {
+ delete $merge_status{"${_}_versions"}{$unqualified_version};
+ }
+ }
+ }
return (\%merge_status,$bugs_to_merge);
}
--
2.39.5