01/01: services: guix: Fix activation when 'authorize-key?' is false.

[Mark H. Weaver]

mhw pushed a commit to branch master
in repository guix.

commit 5f4a446d377d00f2921d0d58406b712ec70fed6a
Author: Mark H Weaver <address@hidden>
Date:   Tue Aug 9 18:21:50 2016 -0400

    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(-)

diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 4474ce7..218f3b3 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 <address@hidden>
 ;;; Copyright © 2015, 2016 Alex Kost <address@hidden>
-;;; Copyright © 2015 Mark H Weaver <address@hidden>
+;;; Copyright © 2015, 2016 Mark H Weaver <address@hidden>
 ;;; Copyright © 2015 Sou Bunnbu <address@hidden>
 ;;; Copyright © 2016 Leo Famulari <address@hidden>
 ;;; Copyright © 2016 David Craven <address@hidden>
@@ -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