merge changes from dla source tree

diff --git a/Debbugs/Config.pm b/Debbugs/Config.pm
index 2b34c664b0954a32b72bfa54decac34bae4930fe..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),
@@ -290,7 +291,9 @@ Default: qx(hostname --fqdn)
 
 my $_old_path = $ENV{PATH};
 $ENV{PATH} = '/bin:/usr/bin:/usr/local/bin';
-set_default(\%config,'machine_name',qx(hostname --fqdn));
+my $temp_hostname = qx(hostname --fqdn);
+chomp $temp_hostname;
+set_default(\%config,'machine_name',$temp_hostname);
 $ENV{PATH} = $_old_path;
 
 =head2 BTS Mailing Lists

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}) {

diff --git a/templates/en_US/html/html_tail.tmpl b/templates/en_US/html/html_tail.tmpl
index 59e671f73c4e85ac02c1a49ba0af0b294ffecbe0..f5c51ab2bae87d16aa1831627b0037caf5dd5d5b 100644 (file)
--- a/templates/en_US/html/html_tail.tmpl
+++ b/templates/en_US/html/html_tail.tmpl
@@ -1,12 +1,8 @@
 <ADDRESS>{$config{maintainer}} &lt;<A HREF="mailto:{$config{maintainer_email}}">{$config{maintainer_email}}</A>&gt;.
 Last modified:
-<!--timestamp-->
-{$last_modified||strftime('%c',gmtime)}
-<!--timestamp-->
+<!--timestamp-->{$last_modified||strftime('%c',gmtime)}<!--end timestamp-->; 
 Machine Name:
-<!--machinename-->
-{$config{machine_name}||'Unknown'}
-<!--machinename-->
+<!--machinename-->{$config{machine_name}||'Unknown'}<!--machinename-->
 <P>
 <A HREF="http://{$config{web_domain}}/">{$config{project}} {$config{bug}} tracking system</A><BR>
 Copyright (C) 1999 Darren O. Benham,