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

[Christoph Berg]

Author: myon
Date: 2006-09-20 09:59:06 +0000 (Wed, 20 Sep 2006)
New Revision: 299

Modified:
   trunk/caff/caff
   trunk/debian/changelog
Log:
* caff: when set, use $ENV{'GNUPGHOME'} to find secring.gpg. Suggested by
  Gerfried Fuchs.

Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2006-08-21 10:00:54 UTC (rev 298)
+++ trunk/caff/caff	2006-09-20 09:59:06 UTC (rev 299)
@@ -465,7 +465,8 @@
 	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'};

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-08-21 10:00:54 UTC (rev 298)
+++ trunk/debian/changelog	2006-09-20 09:59:06 UTC (rev 299)
@@ -3,6 +3,8 @@
   * 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 at debian.org>  Mon, 21 Aug 2006 11:57:40 +0200