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

[Guilhem Moulin]

Author: guilhem-guest
Date: 2016-07-12 19:34:31 +0000 (Tue, 12 Jul 2016)
New Revision: 866

Modified:
   trunk/caff/caff
Log:
caff: always put the global gpg opts before the local ones.

For instance, if $CONFIG{keyserver} is defined in the ~/.caffrc
(deprecated) and ~/.gnupg/gpg.conf defines a keyserver too, and if there
is no ~/.caff/gnupg/gpg.conf, then $CONFIG{keyserver} must be listed
*after* the one from ~/.gnupg/gpg.conf as it should take precedence.

Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2016-07-12 15:15:11 UTC (rev 865)
+++ trunk/caff/caff	2016-07-12 19:34:31 UTC (rev 866)
@@ -809,10 +809,10 @@
     $h{always_trust} //= 1;
     $h{extra_args} //= [];
 
-    push @{$h{extra_args}}, @GNUPGOPTS if @GNUPGOPTS and defined $h{homedir};
-    push @{$h{extra_args}}, '--no-auto-check-trustdb';
-    push @{$h{extra_args}}, '--fixed-list-mode' if GnuPG_version('2.0.0') <  0;
-    push @{$h{extra_args}}, '--no-autostart'    if GnuPG_version('2.1.0') >= 0; # never autostart
+    unshift @{$h{extra_args}}, '--no-auto-check-trustdb';
+    unshift @{$h{extra_args}}, '--fixed-list-mode' if GnuPG_version('2.0.0') <  0;
+    unshift @{$h{extra_args}}, '--no-autostart'    if GnuPG_version('2.1.0') >= 0; # never autostart
+    unshift @{$h{extra_args}}, @GNUPGOPTS if @GNUPGOPTS and defined $h{homedir};
 
     $gpg->options->hash_init(%h);
     debug(join (' ', $gpg->call(), $gpg->options->get_args(), "..."));