From 5f4a446d377d00f2921d0d58406b712ec70fed6a Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 9 Aug 2016 18:21:50 -0400 Subject: 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. --- gnu/services/base.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/services/base.scm') 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 ;;; Copyright © 2015, 2016 Alex Kost -;;; Copyright © 2015 Mark H Weaver +;;; Copyright © 2015, 2016 Mark H Weaver ;;; Copyright © 2015 Sou Bunnbu ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2016 David Craven @@ -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 -- cgit v1.2.3