summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndreas Enge <andreas@enge.fr>2013-02-23 23:27:46 +0100
committerAndreas Enge <andreas@enge.fr>2013-02-23 23:27:46 +0100
commitca8def6e6fd9670affe8eb489c47d460e46e8061 (patch)
treeb4bcac41be5f2b32abf818926eada86bbe6bd1b9
parent11996d85d3cfa31ecf969421b4dc718b617bf2ff (diff)
downloadguix-ca8def6e6fd9670affe8eb489c47d460e46e8061.tar.gz
Patch-shebang: Do not add space after interpreter without argument.
* guix/build/utils.scm (patch-shebang): Do not add a space after a command
  interpreter not followed by an argument; this made two tests of
  coreutils fail.
-rw-r--r--guix/build/utils.scm4
1 files changed, 3 insertions, 1 deletions
diff --git a/guix/build/utils.scm b/guix/build/utils.scm
index f7fb7938e5..d17346607f 100644
--- a/guix/build/utils.scm
+++ b/guix/build/utils.scm
@@ -486,7 +486,9 @@ FILE are kept unchanged."
                                                 "patch-shebang: ~a: changing `~a' to `~a'~%"
                                                 file interp bin)
                                         (patch p bin
-                                               (string-append " " arg1 rest)))))
+                                               (if (string-null? arg1)
+                                                   ""
+                                                   (string-append " " arg1 rest))))))
                                 (begin
                                   (format (current-error-port)
                                           "patch-shebang: ~a: warning: no binary for interpreter `~a' found in $PATH~%"