From a738a663a99ea63078cbba63d9b267e123f475d5 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sun, 13 Sep 2020 15:45:53 +1000 Subject: utils: wrap-program: Refuse to wrap .X-real files. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/build/utils.scm (wrap-program): Error if wrap-program was mistakenly passed a .X-real file. This prevents and forces us to fix cases where a double wrapped ..X-real-real file is created, such as can be seen with: "find /gnu/ -iname '.*-real-real'". Signed-off-by: Ludovic Courtès --- guix/build/utils.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'guix/build/utils.scm') diff --git a/guix/build/utils.scm b/guix/build/utils.scm index a15beac114..dbfc0a9142 100644 --- a/guix/build/utils.scm +++ b/guix/build/utils.scm @@ -1303,6 +1303,9 @@ with definitions for VARS." (format #f "export ~a=\"$~a${~a:+:}~a\"" var var var (string-join rest ":"))))) + (when (wrapped-program? prog) + (error (string-append prog " is a wrapper. Refusing to wrap."))) + (if already-wrapped? ;; PROG is already a wrapper: add the new "export VAR=VALUE" lines just -- cgit v1.2.3