nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Mark H Weaver 2016-08-09 18:21:50 -04:00
parent a12ba6e878
commit 5f4a446d37
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gnu/services/base.scm
View File

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com> ;;; 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 © 2015 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2016 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 David Craven <david@craven.ch> ;;; 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. ;; chown leads to an entire copy of the tree, which is a bad idea.
;; Optionally authorize hydra.gnu.org's key. ;; Optionally authorize hydra.gnu.org's key.
(and authorize-key? (if authorize-key?
(hydra-key-authorization guix))))) (hydra-key-authorization guix)
#~#f))))
(define guix-service-type (define guix-service-type
(service-type (service-type