[Pgp-tools-commit] r791 - trunk/caff

[Guilhem Moulin]

Author: guilhem-guest
Date: 2015-02-20 19:50:55 +0000 (Fri, 20 Feb 2015)
New Revision: 791

Modified:
   trunk/caff/caff
Log:
caff: Don't use the legacy (but harmless) --secret-keyring with gpg 2.1

Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2015-02-20 19:37:15 UTC (rev 790)
+++ trunk/caff/caff	2015-02-20 19:50:55 UTC (rev 791)
@@ -1514,7 +1514,7 @@
 			my @command = ($CONFIG{'gpg'});
 			push @command, '--local-user', $local_user;
 			push @command, "--homedir=$GNUPGHOME";
-			push @command, '--secret-keyring', $CONFIG{'secret-keyring'};
+			push @command, '--secret-keyring', $CONFIG{'secret-keyring'} if $GNUPG_VERSION < 2.1;
 			push @command, qw/--no-auto-check-trustdb --trust-model=always/;
 			push @command, '--edit-key', $keyid;
 			push @command, 'showphoto' if $CONFIG{'show-photos'};
@@ -1663,7 +1663,7 @@
 		foreach my $local_user (@LOCAL_USER) {
 			my @command = ($CONFIG{'gpg'});
 			push @command, '--local-user', $local_user;
-			push @command, '--secret-keyring', $CONFIG{'secret-keyring'};
+			push @command, '--secret-keyring', $CONFIG{'secret-keyring'} if $GNUPG_VERSION < 2.1;
 			push @command, qw/--no-auto-check-trustdb --trust-model=always/;
 			push @command, '--edit-key', $keyid;
 			push @command, 'showphoto' if $CONFIG{'show-photos'};