summaryrefslogtreecommitdiff
path: root/gnu/services
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-03-09 23:49:18 +0100
committerLudovic Courtès <ludo@gnu.org>2015-03-09 23:51:43 +0100
commit116244df95faf664fd6f106ac8c3117674f81310 (patch)
tree557d88599493f1f2d14ccdc44546b9948cee2c66 /gnu/services
parentb0b727808b0b3466959b3f7143d35435834df0ee (diff)
downloadpatches-116244df95faf664fd6f106ac8c3117674f81310.tar
patches-116244df95faf664fd6f106ac8c3117674f81310.tar.gz
services: Statically report duplicate dmd service identifiers.
Reported by 白い熊 @相撲道 <guix-devel_gnu.org@sumou.com> at <http://lists.gnu.org/archive/html/guix-devel/2015-03/msg00264.html>. * gnu/services/dmd.scm (assert-no-duplicates): New procedure. (dmd-configuration-file): Use it. * po/guix/POTFILES.in: Add gnu/services/dmd.scm. * tests/guix-system.sh (errorfile): Add test.
Diffstat (limited to 'gnu/services')
-rw-r--r--gnu/services/dmd.scm26
1 files changed, 26 insertions, 0 deletions
diff --git a/gnu/services/dmd.scm b/gnu/services/dmd.scm
index 4bf76e01ec..618df91c5e 100644
--- a/gnu/services/dmd.scm
+++ b/gnu/services/dmd.scm
@@ -17,6 +17,8 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu services dmd)
+ #:use-module (guix ui)
+ #:use-module (guix sets)
#:use-module (guix gexp)
#:use-module (guix store)
#:use-module (guix monads)
@@ -24,6 +26,8 @@
#:use-module (gnu services)
#:use-module (ice-9 match)
#:use-module (srfi srfi-1)
+ #:use-module (srfi srfi-34)
+ #:use-module (srfi srfi-35)
#:export (dmd-configuration-file))
;;; Commentary:
@@ -32,6 +36,26 @@
;;;
;;; Code:
+(define (assert-no-duplicates services)
+ "Raise an error if SERVICES provide the same dmd service more than once.
+
+This is a constraint that dmd's 'register-service' verifies but we'd better
+verify it here statically than wait until PID 1 halts with an assertion
+failure."
+ (fold (lambda (service set)
+ (define (assert-unique symbol)
+ (when (set-contains? set symbol)
+ (raise (condition
+ (&message
+ (message
+ (format #f (_ "service '~a' provided more than once")
+ symbol)))))))
+
+ (for-each assert-unique (service-provision service))
+ (fold set-insert set (service-provision service)))
+ (setq)
+ services))
+
(define (dmd-configuration-file services)
"Return the dmd configuration file for SERVICES."
(define modules
@@ -40,6 +64,8 @@
(gnu build file-systems)
(guix build utils)))
+ (assert-no-duplicates services)
+
(mlet %store-monad ((modules (imported-modules modules))
(compiled (compiled-modules modules)))
(define config