03/07: gnu: docker: Harmonize LookPath regexes.

[guix-commits]

apteryx pushed a commit to branch master
in repository guix.

commit 3f280d3950f60da8f04f0dc5e767bcddc4749523
Author: Maxim Cournoyer <address@hidden>
Date:   Thu Apr 11 22:12:00 2019 -0400

    gnu: docker: Harmonize LookPath regexes.
    
    * gnu/packages/docker.scm (docker)[phases]: In the patch-paths phase, update
    the regexes used by SUBSTITUTE-LOOKPATH and SUBSTITUTE-COMMAND to match at 
the
    start of the word, like it's done later.
---
 gnu/packages/docker.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index 44f902b..847871a 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -372,7 +372,7 @@ built-in registry server of Docker.")
                                  ((substitute-LookPath source-text package
                                                        relative-path)
                                   #`(substitute* source-files
-                                      ((#,(string-append "exec\\.LookPath\\(\""
+                                      ((#,(string-append 
"\\<exec\\.LookPath\\(\""
                                                          (syntax->datum
                                                           #'source-text)
                                                          "\")"))
@@ -386,11 +386,12 @@ built-in registry server of Docker.")
                                  ((substitute-LookPath source-text package
                                                        relative-path)
                                   #`(substitute* source-files
-                                      ((#,(string-append "exec\\.Command\\(\""
+                                      ((#,(string-append 
"\\<(re)?exec\\.Command\\(\""
                                                          (syntax->datum
                                                           #'source-text)
-                                                         "\""))
-                                       (string-append "exec.Command(\""
+                                                         "\"") _ re?)
+                                       (string-append (if re? re? "")
+                                                      "exec.Command(\""
                                                       (assoc-ref inputs 
package)
                                                       relative-path
                                                       "\""))))))))