[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug#43367] [PATCH 1/5] utils: wrap-program: Refuse to wrap .X-real file

From: Brendan Tildesley
Subject: [bug#43367] [PATCH 1/5] utils: wrap-program: Refuse to wrap .X-real files.
Date: Sun, 13 Sep 2020 15:45:53 +1000

*    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'
 guix/build/utils.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/guix/build/utils.scm b/guix/build/utils.scm
index e872cfffd3..822191f4de 100644
--- a/guix/build/utils.scm
+++ b/guix/build/utils.scm
@@ -1194,6 +1194,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

reply via email to

[Prev in Thread] Current Thread [Next in Thread]