summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAttila Lendvai <attila@lendvai.name>2022-08-24 14:40:42 +0200
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2022-08-25 00:10:42 -0400
commit6fb9759ef3b8eb2a2b10c3f02a57ece29b5c53ba (patch)
treed595379184b9aae3617ccffcc07bc08abb35de3f
parentee08277a70d29b6d707524a4e17620f50b87adf4 (diff)
services: configuration: Change the value of the unset marker.
The new value of %unset-value sticks out more when something goes wrong, and is also more unique; i.e. easier to search for. Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
-rw-r--r--gnu/services/configuration.scm5
-rw-r--r--gnu/services/messaging.scm2
-rw-r--r--tests/services/configuration.scm2
3 files changed, 5 insertions, 4 deletions
diff --git a/gnu/services/configuration.scm b/gnu/services/configuration.scm
index 60965486a7..83da63c1b3 100644
--- a/gnu/services/configuration.scm
+++ b/gnu/services/configuration.scm
@@ -305,12 +305,13 @@ does not have a default value" field kind)))
;; Ideally this should be an implementation detail, but we export it
;; to provide a simpler API that enables unsetting a configuration
-;; field that has a maybe type, but also a default value.
+;; field that has a maybe type, but also a default value. We give it
+;; a value that sticks out to the reader when something goes wrong.
;;
;; An example use-case would be something like a network application
;; that uses a default port, but the field can explicitly be unset to
;; request a random port at startup.
-(define %unset-value 'unset)
+(define %unset-value '%unset-marker%)
(define (maybe-value-set? value)
"Predicate to check whether a 'maybe' value was explicitly provided."
diff --git a/gnu/services/messaging.scm b/gnu/services/messaging.scm
index 59cb486778..02712ede7c 100644
--- a/gnu/services/messaging.scm
+++ b/gnu/services/messaging.scm
@@ -95,7 +95,7 @@
;; doesn't interfere with
;; define-configuration and define-maybe
;; internals.
- #''unset def))
+ #''%unset-marker% def))
#'(def ...) #'(target ...)))
((new-doc ...)
(map (lambda (doc target)
diff --git a/tests/services/configuration.scm b/tests/services/configuration.scm
index 8ed4ed4b66..4f8a74dc8a 100644
--- a/tests/services/configuration.scm
+++ b/tests/services/configuration.scm
@@ -150,7 +150,7 @@
(protocol maybe-symbol ""))
;;; Maybe symbol values are currently seen as serializable, because the
-;;; unspecified value is 'unset, which is a symbol itself.
+;;; unspecified value is '%unset-marker%, which is a symbol itself.
;;; TODO: Remove expected fail marker after resolution.
(test-expect-fail 1)
(test-equal "symbol maybe value serialization, unspecified"