kreyren/guix-kreyren
1
0
Fork 0
Code Issues 1 Pull Requests 1 Releases Activity

services: etc: Detect and report duplicate entries.

Browse Source 
Fixes <https://bugs.gnu.org/40729>.
Reported by Christopher Baines <mail@cbaines.net>.

* gnu/services.scm (files->etc-directory)[assert-no-duplicates]: New
procedure.
Use it.
This commit is contained in:
Ludovic Courtès 2020-04-20 22:31:38 +02:00
parent b25ecfa2e0
commit a322e9d16b
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gnu/services.scm
View File

@ -632,6 +632,23 @@ and FILE could be \"/usr/bin/env\"."
(files->etc-directory (service-value service))) (files->etc-directory (service-value service)))
(define (files->etc-directory files) (define (files->etc-directory files)
(define (assert-no-duplicates files)
(let loop ((files files)
(seen (set)))
(match files
(() #t)
(((file _) rest ...)
(when (set-contains? seen file)
(raise (condition
(&message
(message (format #f (G_ "duplicate '~a' entry for /etc")
file))))))
(loop rest (set-insert file seen))))))
;; Detect duplicates early instead of letting them through, eventually
;; leading to a build failure of "etc.drv".
(assert-no-duplicates files)
(file-union "etc" files)) (file-union "etc" files))
(define (etc-entry files) (define (etc-entry files)