[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: gnupg: Honor $GUIX_GPG_COMMAND and default to 'gpg'.
|
From: |
Ludovic Courtès |
|
Subject: |
02/02: gnupg: Honor $GUIX_GPG_COMMAND and default to 'gpg'. |
|
Date: |
Tue, 6 Sep 2016 09:12:47 +0000 (UTC) |
civodul pushed a commit to branch master
in repository guix.
commit 0c90ed5505e04540b1982c04993369fb9706a916
Author: Ludovic Courtès <address@hidden>
Date: Tue Sep 6 09:23:43 2016 +0200
gnupg: Honor $GUIX_GPG_COMMAND and default to 'gpg'.
* guix/gnupg.scm (%gpg-command): Change to "gpg" or $GUIX_GPG_COMMAND.
---
guix/gnupg.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/guix/gnupg.scm b/guix/gnupg.scm
index d1d8b37..ef8f900 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 <address@hidden>
+;;; Copyright © 2010, 2011, 2013, 2014, 2016 Ludovic Courtès <address@hidden>
;;; Copyright © 2013 Nikita Karetnikov <address@hidden>
;;;
;;; 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