diff options
| author | Mark H Weaver <mhw@netris.org> | 2016-08-09 18:21:50 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-08-14 02:48:51 -0400 |
| commit | 5f4a446d377d00f2921d0d58406b712ec70fed6a (patch) | |
| tree | a9e1d2bc7c6a186463331fc03f3ae38e98764f23 /gnu | |
| parent | a12ba6e878dac175debbc7ada6171916c60a85b7 (diff) | |
| download | guix-5f4a446d377d00f2921d0d58406b712ec70fed6a.tar guix-5f4a446d377d00f2921d0d58406b712ec70fed6a.tar.gz | |
services: guix: Fix activation when 'authorize-key?' is false.
* gnu/services/base.scm (guix-activation): Ensure that a gexp is
returned when 'authorize-key?' is false.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/services/base.scm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 4474ce7996..218f3b3cf3 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com> -;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> +;;; Copyright © 2015, 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2016 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016 David Craven <david@craven.ch> @@ -1099,8 +1099,9 @@ failed to register hydra.gnu.org public key: ~a~%" status)))))))) ;; chown leads to an entire copy of the tree, which is a bad idea. ;; Optionally authorize hydra.gnu.org's key. - (and authorize-key? - (hydra-key-authorization guix))))) + (if authorize-key? + (hydra-key-authorization guix) + #~#f)))) (define guix-service-type (service-type |