~ruther/guix-local: gexp: Make sure 'gexp-outputs' removes duplicate outputs.

7e75a6739bf02c39baf8340e31e590c2c7c5fd16 — Ludovic Courtès 11 years ago 3820d39

gexp: Make sure 'gexp-outputs' removes duplicate outputs.

Fixes a regression introduced in f9efe56.

* guix/gexp.scm (gexp-outputs): Add call to 'delete-duplicates'.
* tests/gexp.scm ("output list, combined gexps, duplicate output"): New
  test.

patch browse .tar.gz

2 files changed, 9 insertions(+), 1 deletions(-)

M guix/gexp.scm
M tests/gexp.scm

M guix/gexp.scm => guix/gexp.scm +2 -1

@@ 319,7 319,8 @@ references."
       (_
        result)))
 
-  (add-reference-output (gexp-references exp) '()))
+  (delete-duplicates
+   (add-reference-output (gexp-references exp) '())))
 
 (define* (gexp->sexp exp #:key
                      (system (%current-system))

M tests/gexp.scm => tests/gexp.scm +7 -0

@@ 230,6 230,13 @@
                 (gexp-outputs exp2))
          (= 2 (length (gexp-outputs exp2))))))
 
+(test-equal "output list, combined gexps, duplicate output"
+  1
+  (let* ((exp0 (gexp (mkdir (ungexp output))))
+         (exp1 (gexp (begin (mkdir (ungexp output)) (ungexp exp0))))
+         (exp2 (gexp (begin (mkdir (ungexp output)) (ungexp exp1)))))
+    (length (gexp-outputs exp2))))
+
 (test-assert "output list + ungexp-splicing list, combined gexps"
   (let* ((exp0  (gexp (mkdir (ungexp output))))
          (exp1  (gexp (mkdir (ungexp output "foo"))))