* Remove newline from default machine name

 * Add semicolon between date and machine name; ditch extra newlines

diff --git a/Debbugs/Config.pm b/Debbugs/Config.pm
index 2b34c664b0954a32b72bfa54decac34bae4930fe..15a69e7c6f4c332194c244d8ad85e40db6e01ce6 100644 (file)
--- a/Debbugs/Config.pm
+++ b/Debbugs/Config.pm
@@ -290,7 +290,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/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,