From 42e3089752b9fdfd0569b990085fc1cd5cd75f77 Mon Sep 17 00:00:00 2001 From: Attila Lendvai Date: Sun, 3 Oct 2021 14:43:02 +0200 Subject: guix: build: Factor out default collision-resolver. This prepares the stage for new collision resolvers without changing the underlying semantics too much. * guix/build/union.scm (resolve+warn-if-harmful): New variable. (warn-about-collision): Rename to... (resolve-collision/default): ... this. Implement in terms of resolve+warn-if-harmful. (union-build): Adjust accordingly. * guix/gexp.scm (directory-union): Likewise. Signed-off-by: Liliana Marie Prikler --- guix/gexp.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'guix/gexp.scm') diff --git a/guix/gexp.scm b/guix/gexp.scm index 73595a216b..a50b93ed48 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -2128,7 +2128,7 @@ This yields an 'etc' directory containing these two files." (define* (directory-union name things #:key (copy? #f) (quiet? #f) - (resolve-collision 'warn-about-collision)) + (resolve-collision 'resolve-collision/default)) "Return a directory that is the union of THINGS, where THINGS is a list of file-like objects denoting directories. For example: -- cgit v1.2.3