From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: Danny Milosavljevic <dannym@scratchpost.org>
Cc: 35282@debbugs.gnu.org
Subject: [bug#35282] [PATCH] gnu: docker: Patch paths of xz and docker-proxy.
Date: Mon, 15 Apr 2019 15:05:53 -0400 [thread overview]
Message-ID: <87h8azm6lq.fsf@gmail.com> (raw)
In-Reply-To: <20190415075632.3a5802e8@scratchpost.org> (Danny Milosavljevic's message of "Mon, 15 Apr 2019 07:56:32 +0200")
Hello Danny!
Danny Milosavljevic <dannym@scratchpost.org> writes:
>>diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
>>index 10aa3aa5b4..6e598e4d18 100644
>>--- a/gnu/packages/docker.scm
>>+++ b/gnu/packages/docker.scm
>>@@ -375,7 +375,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)
>> "\")"))
>>@@ -389,7 +389,7 @@ built-in registry server of Docker.")
>> ((substitute-LookPath source-text package
>> relative-path)
>> #`(substitute* source-files
>>- ((#,(string-append "exec\\.Command\\(\""
>>+ ((#,(string-append "\\<exec\\.Command\\(\""
>> (syntax->datum
>> #'source-text)
> "\"")
> Then it wouldn't match those:
>
> ./builder/dockerfile/copy_windows.go: cmd := reexec.Command("windows-fix-permissions", source, destination, identity.SID)
> ./daemon/graphdriver/overlay2/mount.go: cmd := reexec.Command("docker-mountfrom", dir)
> ./daemon/graphdriver/windows/windows.go: cmd := reexec.Command(append([]string{"docker-windows-write-layer", d.info.HomeDir, id}, parentLayerPaths...)...)
> ./pkg/chrootarchive/archive_unix.go: cmd := reexec.Command("docker-untar", dest)
> ./pkg/chrootarchive/diff_unix.go: cmd := reexec.Command("docker-applyLayer", dest)
Those are currently commented out (not in the actual code), so it was
working with the change, but thanks for bringing this to my attention.
> Why did you change it?
As the commit message says, it was to harmonize the macros' regexes with
the other regexes found in later substitute* uses. I didn't see the
need to have different flavors of the same.
I suggest amending my patch with:
--8<---------------cut here---------------start------------->8---
@@ -389,7 +389,7 @@ 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)
"\""))
--8<---------------cut here---------------end--------------->8---
To be future proof.
What do you think?
Maxim
next prev parent reply other threads:[~2019-04-15 19:07 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-15 0:12 [bug#35282] [PATCH] gnu: docker: Patch paths of xz and docker-proxy Maxim Cournoyer
2019-04-15 5:56 ` Danny Milosavljevic
2019-04-15 19:05 ` Maxim Cournoyer [this message]
2019-04-15 20:19 ` [bug#35282] [PATCHv2] " Maxim Cournoyer
2019-04-15 21:44 ` Danny Milosavljevic
2019-04-16 14:54 ` Maxim Cournoyer
2019-05-06 1:43 ` T460s laptop
2019-05-06 14:48 ` bug#35282: " Ricardo Wurmus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87h8azm6lq.fsf@gmail.com \
--to=maxim.cournoyer@gmail.com \
--cc=35282@debbugs.gnu.org \
--cc=dannym@scratchpost.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.