* caff: when set, use $ENV{'GNUPGHOME'} to find secring.gpg. Suggested by

  Gerfried Fuchs.

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

diff --git a/caff/caff b/caff/caff
index 799485865463966fa9e61c6690137b26c769dfdd..cb25412c75d54e2dd68faf4174ae8a58d79b77a6 100755 (executable)
--- a/caff/caff
+++ b/caff/caff
@@ -465,7 +465,8 @@ sub load_config() {
        check_executable("gpg", $CONFIG{'gpg'});
        check_executable("gpg-sign", $CONFIG{'gpg-sign'});
        check_executable("gpg-delsig", $CONFIG{'gpg-delsig'});
-       $CONFIG{'secret-keyring'} = $ENV{'HOME'}.'/.gnupg/secring.gpg' unless defined $CONFIG{'secret-keyring'};
+       $CONFIG{'secret-keyring'} = ($ENV{'GNUPGHOME'} || "$ENV{'HOME'}/.gnupg") . '/secring.gpg'
+               unless defined $CONFIG{'secret-keyring'};
        $CONFIG{'no-download'} = 0 unless defined $CONFIG{'no-download'};
        $CONFIG{'no-sign'} = 0 unless defined $CONFIG{'no-sign'};
        $CONFIG{'key-files'} = () unless defined $CONFIG{'key-files'};

diff --git a/debian/changelog b/debian/changelog
index 6e588c309cc36fae3c1e512c1f1bc9eef73482c8..044b37b8c16981f9ab2dd7edbebe864611b65259 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ signing-party (0.4.8-1) unreleased; urgency=low
   * gpglist: do not die with with-fingerprint (Closes: #382019).
   * gpg-key2ps: add --list-key to gpg call (works around #382794).
   * sig2dot: integrate source in this package.
+  * caff: when set, use $ENV{'GNUPGHOME'} to find secring.gpg. Suggested by
+    Gerfried Fuchs.
 
  -- Christoph Berg <myon@debian.org>  Mon, 21 Aug 2006 11:57:40 +0200