~ruther/guix-local: services: guix: Fix activation when 'authorize-key?' is false.

5f4a446d377d00f2921d0d58406b712ec70fed6a — Mark H Weaver 9 years ago a12ba6e

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.

patch browse .tar.gz

1 files changed, 4 insertions(+), 3 deletions(-)

M gnu/services/base.scm

M gnu/services/base.scm => gnu/services/base.scm +4 -3

@@ 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