branch core-updates updated: build-system/gnu: Fix patch-dot-desktop-files regexp.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

nckx pushed a commit to branch core-updates
in repository guix.

The following commit(s) were added to refs/heads/core-updates by this push:
     new 685110045c build-system/gnu: Fix patch-dot-desktop-files regexp.
685110045c is described below

commit 685110045c04a60bf18163aab1c230f944c871c9
Author: Brendan Tildesley <mail@brendan.scot>
AuthorDate: Fri Apr 9 21:43:54 2021 +1000

    build-system/gnu: Fix patch-dot-desktop-files regexp.
    
    When patching .desktop files, Exec= values beginning with "/", (or
    spaces or newline characters) will result in BINARY matching the empty
    string.  Changing "*", meaning 0 or more, to "+", meaning 1 or more,
    ensures it will match a basename of at least length 1, or nothing.
    
    * guix/build/gnu-build-system.scm (patch-dot-desktop-files):
    Substitute ‘+’ for ‘*’.
    
    Signed-off-by: Tobias Geerinckx-Rice <me@tobias.gr>
---
 guix/build/gnu-build-system.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm
index d84411c090..b5b4468a45 100644
--- a/guix/build/gnu-build-system.scm
+++ b/guix/build/gnu-build-system.scm
@@ -727,9 +727,9 @@ which cannot be found~%"
                      ;; UTF-8-encoded.
                      (with-fluids ((%default-port-encoding "UTF-8"))
                        (substitute* files
-                         (("^Exec=([^/[:blank:]\r\n]*)(.*)$" _ binary rest)
+                         (("^Exec=([^/[:blank:]\r\n]+)(.*)$" _ binary rest)
                           (string-append "Exec=" (which binary) rest))
-                         (("^TryExec=([^/[:blank:]\r\n]*)(.*)$" _ binary rest)
+                         (("^TryExec=([^/[:blank:]\r\n]+)(.*)$" _ binary rest)
                           (string-append "TryExec="
                                          (which binary) rest)))))))))
             outputs))