[Pgp-tools-commit] r273 - in trunk: caff debian

[Christoph Berg]

Author: myon
Date: 2006-04-30 09:00:26 +0000 (Sun, 30 Apr 2006)
New Revision: 273

Modified:
   trunk/caff/caff
   trunk/debian/changelog
Log:
* caff:
  + Try hostname without -f first to be compatible with BSD
    (Closes: #356830).

Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2006-04-04 07:18:31 UTC (rev 272)
+++ trunk/caff/caff	2006-04-30 09:00:26 UTC (rev 273)
@@ -334,9 +334,12 @@
 	my $gecos = defined $ENV{'LOGNAME'} ? (getpwnam($ENV{LOGNAME}))[6] : undef;
 	my $email;
 	my @keys;
-	my $hostname = `hostname -f`;
+	# BSD does not have hostname -f, so we try without -f first
+	my $hostname = `hostname`;
+	$hostname = `hostname -f` unless $hostname =~ /\./;
 	chomp $hostname;
 	my ($Cgecos,$Cemail,$Ckeys) = ('','','');
+
 	if (defined $gecos) {
 		$gecos =~ s/,.*//;
 

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-04-04 07:18:31 UTC (rev 272)
+++ trunk/debian/changelog	2006-04-30 09:00:26 UTC (rev 273)
@@ -1,3 +1,11 @@
+signing-party (0.4.6-1) unreleased; urgency=low
+
+  * caff:
+    + Try hostname without -f first to be compatible with BSD
+      (Closes: #356830).
+
+ -- Christoph Berg <myon at debian.org>  Sun, 30 Apr 2006 10:52:10 +0200
+
 signing-party (0.4.5-1) unstable; urgency=low
 
   * Upgrade debhelper compatibility to the recommended level 5.