From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:34447) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hG6wZ-0002da-R6 for guix-patches@gnu.org; Mon, 15 Apr 2019 15:07:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hG6wY-0008V6-Ko for guix-patches@gnu.org; Mon, 15 Apr 2019 15:07:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50121) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hG6wY-0008Uu-D2 for guix-patches@gnu.org; Mon, 15 Apr 2019 15:07:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hG6wY-0001LI-5m for guix-patches@gnu.org; Mon, 15 Apr 2019 15:07:02 -0400 Subject: [bug#35282] [PATCH] gnu: docker: Patch paths of xz and docker-proxy. Resent-Message-ID: From: Maxim Cournoyer References: <87h8b0nn1z.fsf@gmail.com> <20190415075632.3a5802e8@scratchpost.org> Date: Mon, 15 Apr 2019 15:05:53 -0400 In-Reply-To: <20190415075632.3a5802e8@scratchpost.org> (Danny Milosavljevic's message of "Mon, 15 Apr 2019 07:56:32 +0200") Message-ID: <87h8azm6lq.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Danny Milosavljevic Cc: 35282@debbugs.gnu.org Hello Danny! Danny Milosavljevic 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 "\\> (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 "\\> (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 "\\datum #'source-text) "\"")) --8<---------------cut here---------------end--------------->8--- To be future proof. What do you think? Maxim