add missing @gAffectsDistributionTags; map the distribution tags appropriately

diff --git a/Debbugs/Config.pm b/Debbugs/Config.pm
index 15a69e7c6f4c332194c244d8ad85e40db6e01ce6..c936a4dd505a9d99a64483a2317dd09ce19e42a2 100644 (file)
--- 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 ac1346afa96d25ea291836a76d85ab2dfcc94d47..fe902649fc5376c2e5e6046a4626f7ab6e27abae 100644 (file)
--- 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}) {