[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/07: gnu: docker: Harmonize LookPath regexes.
From: |
guix-commits |
Subject: |
03/07: gnu: docker: Harmonize LookPath regexes. |
Date: |
Sun, 5 May 2019 21:42:40 -0400 (EDT) |
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
"\""))))))))
- branch master updated (7a31d93 -> 59781b3), guix-commits, 2019/05/05
- 03/07: gnu: docker: Harmonize LookPath regexes.,
guix-commits <=
- 02/07: gnu: docker: Cleanup extraneous comments., guix-commits, 2019/05/05
- 04/07: gnu: docker: Make macros use a relative path as argument., guix-commits, 2019/05/05
- 05/07: gnu: docker: Optimize substitution macros., guix-commits, 2019/05/05
- 01/07: gnu: docker: Fix indentation., guix-commits, 2019/05/05
- 07/07: gnu: docker: Refer to xz by its absolute path., guix-commits, 2019/05/05
- 06/07: gnu: docker: Patch the reference to the docker proxy., guix-commits, 2019/05/05