From: Don Armstrong <don@donarmstrong.com>
Date: Sat, 13 Dec 2008 18:03:57 +0000 (-0600)
Subject: add missing @gAffectsDistributionTags; map the distribution tags appropriately
X-Git-Tag: release/2.6.0~465^2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=42f9c9b6f181ba179fe3e33bfa56154868b424e9;p=debbugs.git

add missing @gAffectsDistributionTags; map the distribution tags appropriately
---

diff --git a/Debbugs/Config.pm b/Debbugs/Config.pm
index 15a69e7c..c936a4dd 100644
--- a/Debbugs/Config.pm
+++ b/Debbugs/Config.pm
@@ -67,6 +67,7 @@ BEGIN {
 				 qw(%gObsoleteSeverities),
 				 qw(@gPostProcessall @gRemovalDefaultDistributionTags @gRemovalDistributionTags @gRemovalArchitectures),
 				 qw(@gRemovalStrongSeverityDefaultDistributionTags),
+				 qw(@gAffectsDistributionTags),
 				 qw(@gDefaultArchitectures),
 				 qw($gMachineName),
 				 qw($gTemplateDir),
diff --git a/Debbugs/Status.pm b/Debbugs/Status.pm
index ac1346af..fe902649 100644
--- a/Debbugs/Status.pm
+++ b/Debbugs/Status.pm
@@ -1076,10 +1076,15 @@ sub bug_presence {
 	       my $some_distributions_disallowed = 0;
 	       my %allowed_distributions;
 	       for my $tag (split ' ', ($status{tags}||'')) {
-		    if (exists $affects_distribution_tags{$tag}) {
-			 $some_distributions_disallowed = 1;
-			 $allowed_distributions{$tag} = 1;
-		    }
+		   if (exists $config{distribution_aliases}{$tag} and
+			exists $affects_distribution_tags{$config{distribution_aliases}{$tag}}) {
+		       $some_distributions_disallowed = 1;
+		       $allowed_distributions{$config{distribution_aliases}{$tag}} = 1;
+		   }
+		   elsif (exists $affects_distribution_tags{$tag}) {
+		       $some_distributions_disallowed = 1;
+		       $allowed_distributions{$tag} = 1;
+		   }
 	       }
 	       foreach my $arch (make_list($param{arch})) {
 		    for my $package (split /\s*,\s*/, $status{package}) {