* caff:

  + Try hostname without -f first to be compatible with BSD
    (Closes: #356830).

git-svn-id: svn://svn.debian.org/pgp-tools/trunk@273 b513b33f-fedd-0310-b452-c3deb5f4c849

diff --git a/caff/caff b/caff/caff
index 3dd62f10d8e280e01199ae4b715d6f6eda01e973..9712932b92f5f8bcc0831eda8423aa86b8d3c20a 100755 (executable)
--- a/caff/caff
+++ b/caff/caff
@@ -334,9 +334,12 @@ sub generate_config() {
        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/,.*//;
 

diff --git a/debian/changelog b/debian/changelog
index 4b10e4ae53e481fe50f0fb3186543e2964670515..02ce1ab0aa211e07f115c65c7fa28f8a5e49a0ae 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -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@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.