diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-09-06 09:23:43 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-09-06 11:12:11 +0200 |
| commit | 0c90ed5505e04540b1982c04993369fb9706a916 (patch) | |
| tree | 5e565a0cb228aa5d6ebd61ea64985f9d089a1fd6 | |
| parent | 26ffb69399752d6b2c1ea93ac8c6cf7e3d178c02 (diff) | |
| download | guix-0c90ed5505e04540b1982c04993369fb9706a916.tar guix-0c90ed5505e04540b1982c04993369fb9706a916.tar.gz | |
gnupg: Honor $GUIX_GPG_COMMAND and default to 'gpg'.
* guix/gnupg.scm (%gpg-command): Change to "gpg" or $GUIX_GPG_COMMAND.
| -rw-r--r-- | guix/gnupg.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/guix/gnupg.scm b/guix/gnupg.scm index d1d8b377e1..ef8f9000dc 100644 --- a/guix/gnupg.scm +++ b/guix/gnupg.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2010, 2011, 2013, 2014 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2010, 2011, 2013, 2014, 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org> ;;; ;;; This file is part of GNU Guix. @@ -40,7 +40,7 @@ (define %gpg-command ;; The GnuPG 2.x command-line program name. - (make-parameter "gpg2")) + (make-parameter (or (getenv "GUIX_GPG_COMMAND") "gpg"))) (define %openpgp-key-server ;; The default key server. Note that keys.gnupg.net appears to be |