[PATCH] utils: Clean trailing whitespace at end of SHELL

[Eric Bavier <ericbavier@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 462 bytes --]

I found an unfortunate bug in the last patch I made to
patch-makefile-SHELL that would leave a trailing ' ' at the end of SHELL
assignments.  This is fine for most packages, but caused
gobject-introspection to fail building for me just now (for the curious:
it effectively does an "(apply system* (string-split (string-append SHELL
" " "./libtool") #\space))" which causes sh to try to execute "")

The attached patch to core-updates should remedy the problem.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-utils-Clean-trailing-whitespace-at-end-of-SHELL.patch --]
[-- Type: text/x-diff, Size: 969 bytes --]

From c2467a4504737c13435304b1e5c7eb7e4ebf7b70 Mon Sep 17 00:00:00 2001
From: Eric Bavier <bavier@member.fsf.org>
Date: Thu, 4 Sep 2014 09:19:24 -0500
Subject: [PATCH] utils: Clean trailing whitespace at end of SHELL

* guix/build/utils.scm (patch-makefile-SHELL): Remove trailing whitespace.
---
 guix/build/utils.scm |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/build/utils.scm b/guix/build/utils.scm
index f38b2ca..d6365c0 100644
--- a/guix/build/utils.scm
+++ b/guix/build/utils.scm
@@ -590,7 +590,7 @@ When KEEP-MTIME? is true, the atime/mtime of FILE are kept unchanged."
           (format (current-error-port)
                   "patch-makefile-SHELL: ~a: changing `SHELL' from `~a' to `~a'~%"
                   file old new))
-        (string-append "SHELL = " new " " args))))
+        (string-append "SHELL = " new (if (string=? args "\n") "" " ") args))))
 
    (when keep-mtime?
      (set-file-time file st))))
-- 
1.7.9.5


[-- Attachment #3: Type: text/plain, Size: 17 bytes --]


-- 
Eric Bavier