From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:42775) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hFuc3-0004si-Bd for guix-patches@gnu.org; Mon, 15 Apr 2019 01:57:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hFuc2-0007lU-EH for guix-patches@gnu.org; Mon, 15 Apr 2019 01:57:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48263) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hFuc2-0007lI-8h for guix-patches@gnu.org; Mon, 15 Apr 2019 01:57:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hFuc2-0007j4-3p for guix-patches@gnu.org; Mon, 15 Apr 2019 01:57:02 -0400 Subject: [bug#35282] [PATCH] gnu: docker: Patch paths of xz and docker-proxy. Resent-Message-ID: Date: Mon, 15 Apr 2019 07:56:32 +0200 From: Danny Milosavljevic Message-ID: <20190415075632.3a5802e8@scratchpost.org> In-Reply-To: <87h8b0nn1z.fsf@gmail.com> References: <87h8b0nn1z.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/xlE8a4q.Kc7qk9w8x8F9Q+k"; protocol="application/pgp-signature" 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: Maxim Cournoyer Cc: 35282@debbugs.gnu.org --Sig_/xlE8a4q.Kc7qk9w8x8F9Q+k Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable >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 :=3D reexec.Command("windows-fi= x-permissions", source, destination, identity.SID) ./daemon/graphdriver/overlay2/mount.go: cmd :=3D reexec.Command("docker-mou= ntfrom", dir) ./daemon/graphdriver/windows/windows.go: cmd :=3D reexec.Com= mand(append([]string{"docker-windows-write-layer", d.info.HomeDir, id}, par= entLayerPaths...)...) ./pkg/chrootarchive/archive_unix.go: cmd :=3D reexec.Command("docker-unt= ar", dest) ./pkg/chrootarchive/diff_unix.go: cmd :=3D reexec.Command("docker-app= lyLayer", dest) Why did you change it? --Sig_/xlE8a4q.Kc7qk9w8x8F9Q+k Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAly0HRAACgkQ5xo1VCww uqXNaQgAoV3aPasART/+/znvV6bExbKfoPbfqlxYLjOnwD/06ZHZcj+6JJkDTEtS rgXiJ2FfjmjqaBm2M+VEPgkhz7IjNDUL1pGkCHmhHvNP/tD1sqb7cdIsYQ7DpSbG 0LUTvOb04y0HGSEoQaXvg3FlYMW7ErekHZFkWnZkJ2W8/pfoVdrKRvsvFXGQzDqW +OaEEXq4V8viDCHAusI0K0C8zSlgvLoCs9Lv2djjxcpGoUNcpkLbReF28PDUy5QG k+CelY4MG8JTRueUzHz8jNrlqBN/MxxitHeqoGmYp1ypN3/EBhCs0+bFhfctj9R6 eiBcRw2L6Qn7oAm7S43RBMQYLg/BqQ== =b+5/ -----END PGP SIGNATURE----- --Sig_/xlE8a4q.Kc7qk9w8x8F9Q+k--