From: myon <myon@b513b33f-fedd-0310-b452-c3deb5f4c849>
Date: Wed, 20 Sep 2006 09:59:06 +0000 (+0000)
Subject: * caff: when set, use $ENV{'GNUPGHOME'} to find secring.gpg. Suggested by
X-Git-Url: https://git.sthu.org/?a=commitdiff_plain;h=a74ec3cd73bf9bde72e28d0663b6daf8a54e649f;p=pgp-tools.git

* 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 7994858..cb25412 100755
--- 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 6e588c3..044b37b 100644
--- 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