From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id SGpKITHRwWPqeQEAbAwnHQ (envelope-from ) for ; Fri, 13 Jan 2023 22:46:25 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id iBkzITHRwWNBoQAAauVa8A (envelope-from ) for ; Fri, 13 Jan 2023 22:46:25 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 2740C3C04B for ; Fri, 13 Jan 2023 22:46:24 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pGRsB-0004pL-IS; Fri, 13 Jan 2023 16:46:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pGRsA-0004np-2e for bug-guix@gnu.org; Fri, 13 Jan 2023 16:46:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pGRs9-0008G2-Qg for bug-guix@gnu.org; Fri, 13 Jan 2023 16:46:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pGRs9-0005fO-M8 for bug-guix@gnu.org; Fri, 13 Jan 2023 16:46:01 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#60566: [PATCH] environment: Fix '--emulate-fhs' option overriding $PATH. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 13 Jan 2023 21:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60566 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: jman , 60566@debbugs.gnu.org Received: via spool by 60566-submit@debbugs.gnu.org id=B60566.167364632321732 (code B ref 60566); Fri, 13 Jan 2023 21:46:01 +0000 Received: (at 60566) by debbugs.gnu.org; 13 Jan 2023 21:45:23 +0000 Received: from localhost ([127.0.0.1]:52580 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGRrX-0005eS-9w for submit@debbugs.gnu.org; Fri, 13 Jan 2023 16:45:23 -0500 Received: from mail-40133.protonmail.ch ([185.70.40.133]:62559) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGRrV-0005eC-70 for 60566@debbugs.gnu.org; Fri, 13 Jan 2023 16:45:21 -0500 Date: Fri, 13 Jan 2023 21:44:59 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1673646314; x=1673905514; bh=36RuUftznrl5yzkIXXFvebS3QcsxHx+tnNp30Z0G5Bk=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=txFd3Ebe/BJKytDMN/fUzabpTrFMcjkODpnx1hidNpvAuYbzYxlboVrsImQ2JeKRz 7dTvWepDXC8b4IdelU2zpr+ZDbUM6ZNRchIzT0XgYghGTbcF6xOQGiqXafVJ/v81bt 6XkTElZjv79aYGXc1SpWmLOom3N73TZyBWX9Klsta36TLmi3HflWSq8ZDUzhSMdvj7 MCJTcQ4zxSCFdoFCsOySJ9IJgtl3JoODy4assOHggKte+UmoQgD4bVj3G8TbMTV2/f romH+DheLb0M5CE9YsRXe0RhEXyKuRleXa2Tg/07PcRbpfJGdHwNFlr+tpVrxpo+Sf Zn0Dll3b32ggQ== Message-ID: <87zgam85yj.fsf@protonmail.com> In-Reply-To: <874jt3xo37.fsf@gnu.org> References: <874jt4k7bl.fsf@protonmail.com> <874jt3xo37.fsf@gnu.org> Feedback-ID: 7805494:user:proton MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="b1_KlcrGRoReiLt1KmLVaEgv37IIFJc5rU47J3DPQ8YQs8" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: John Kehayias From: John Kehayias via Bug reports for GNU Guix Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1673646385; a=rsa-sha256; cv=none; b=CLOvl4AxNZvp/M/R3RThIYhRoorMaeSHd5puk61n4uffQ+OvNXEB4/FQMgoVUXyDwtXiF8 ahwjRJQnIw4Hh7L4xM89KExXrYV2lnF96ni9B4wbSeLiz53eQfJ7S/q4YlHyJw4t4LVVi4 jgtzFgPuwB8L8CbiiZSnkaAjvdfenspj7sWMoDi03ETxN3gSPsv8UVmLmy0h1EUwis1E+5 isBhA67fL2ALB6j5H7RTXqkGS42hr1dYQK+tf1rje3kN9u5BeioiiN+Pl+Nfz1jzpDytFC 3dtAj5SE0Q/K1MwXdp/CBoHMLdbZMd1SJEXNSUsdN5Vo2ZXlLtgkdacm6Hu5nQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=txFd3Ebe; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1673646385; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=36RuUftznrl5yzkIXXFvebS3QcsxHx+tnNp30Z0G5Bk=; b=cDgj0M3BnAq208dVPHBIlupKnSea7n1BipazgpkpBq+XpoFX/Qo9YXkCun9LGqmwVzUxFt W9+7PHryGwQ8WoSOTHOCHkfIeQp7Azzu/lh2eMYGnndGvxSFkFTxS+wGS9nK3Q1gWMXiQe EBJLmOF984pGNSnPZ2jkl1RY/Zz+1GvKc2qA0b6KEUaTLk6r+UAR2nDhME17FjdywdVpZm 3V0e5VN/+vvL1fk2M6TyxT2Rj3YuYnDSbCV9h2Zs4YoROFRE/fUxZ/9F9DT9Oyev0WWPBE yp/mw3+Hn8dYAeryPoobOIEWkPwjJon0FrAnEdvv5txasuPYkdb17X0RUuCsdg== X-Migadu-Spam-Score: -1.00 X-Spam-Score: -1.00 X-Migadu-Queue-Id: 2740C3C04B X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=txFd3Ebe; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org X-TUID: 8TMGn/rM55l9 This is a multi-part message in MIME format. --b1_KlcrGRoReiLt1KmLVaEgv37IIFJc5rU47J3DPQ8YQs8 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Ludo=E2=80=99, On Sat, Jan 07, 2023 at 12:03 AM, Ludovic Court=C3=A8s wrote: > To be safe, you need to account for (getenv "PATH") returning #f, and > not add a trailing colon in that case. > Ah, right. I think this would only happen if somehow unsetting PATH and pre= serving it? As 'guix shell' already sets PATH. Anyway, better to be safe he= re. I tweaked this, though not sure if there is a more elegant way to construct= the string than what I did (suggestions always welcome!). > Other than that, I agree this is a valid change because that would be > consistent with: > > $ PATH=3D/foo $(type -P guix) shell -E ^PATH$ -C coreutils -- env |grep ^= PATH > PATH=3D/gnu/store/pfl0lyqbs557khv7rw90bzp24qp2lqsn-profile/bin:/foo > > Perhaps you can add a line to test it in > =E2=80=98tests/guix-environment-container.sh=E2=80=99? > I added two tests while I was at it: one to check that PATH has the FHS mod= ification in the container and a second for this particular bug. For the se= cond one I just used a test string added to PATH as the entire thing will d= iffer already from inside/outside the container, FHS or not. I checked the = tests pass here and removing '--emulate-fhs' causes the first to fail while= removing the '--preserve' argument causes the second test to fail. I could= separate the first out as a separate commit if that makes more sense, but = I do think the current behavior is just wrong in overwriting all of PATH wh= en '--emuate-fhs' is given. New version attached, thanks for the suggestions! John --b1_KlcrGRoReiLt1KmLVaEgv37IIFJc5rU47J3DPQ8YQs8 Content-Type: text/x-patch; name=0001-environment-Fix-emulate-fhs-option-overriding-PATH.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0001-environment-Fix-emulate-fhs-option-overriding-PATH.patch RnJvbSBiZWI2ZjkyNTVmYzYyZmU1MmUyMzdmODJjN2U5NTNhMjFiN2Y4MmY0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQ0KRnJvbTogSm9obiBLZWhheWlhcyA8am9obi5rZWhheWlhc0Bwcm90b25t YWlsLmNvbT4NCkRhdGU6IFRodSwgNSBKYW4gMjAyMyAxNjowNjoxOSAtMDUwMA0KU3ViamVjdDog W1BBVENIXSAqIGVudmlyb25tZW50OiBGaXggJy0tZW11bGF0ZS1maHMnIG9wdGlvbiBvdmVycmlk aW5nICRQQVRILg0KDQpGaXhlcyA8aHR0cHM6Ly9pc3N1ZXMuZ3VpeC5nbnUub3JnLzYwNTY2PiB3 aGVyZSBldmVuIGlmICItLXByZXNlcnZlPSdeUEFUSCQnIg0Kd2FzIHBhc3NlZCB0byAnZ3VpeCBz aGVsbCcgaXQgd291bGQgYmUgcmVwbGFjZWQgYnkganVzdCB0aGUgRkhTIGRpcmVjdG9yaWVzDQp3 aGVuICctLWVtdWxhdGUtZmhzJyB3YXMgYWxzbyBzZXQuDQoNCiogZ251L3NjcmlwdHMvZW52aXJv bm1lbnQuc2NtIChsYXVuY2gtZW52aXJvbm1lbnQpOiBBZGQgdGhlIEZIUyBkaXJlY3RvcmllcyB0 bw0KJFBBVEggcmF0aGVyIHRoYW4gb3ZlcnJpZGluZyAkUEFUSCBjb21wbGV0ZWx5Lg0KKiB0ZXN0 cy9ndWl4LWVudmlyb25tZW50LWNvbnRhaW5lci5zaDogVGVzdCB0aGF0IEZIUyBkaXJlY3Rvcmll cyBhcmUgaW4gJFBBVEgNCmluIHRoZSBjb250YWluZXIgYW5kIHRoYXQgJFBBVEggY2FuIGJlIHBy ZXNlcnZlZC4NCi0tLQ0KIGd1aXgvc2NyaXB0cy9lbnZpcm9ubWVudC5zY20gICAgICAgIHwgIDgg KysrKystLS0NCiB0ZXN0cy9ndWl4LWVudmlyb25tZW50LWNvbnRhaW5lci5zaCB8IDE4ICsrKysr KysrKysrKysrKysrLQ0KIDIgZmlsZXMgY2hhbmdlZCwgMjIgaW5zZXJ0aW9ucygrKSwgNCBkZWxl dGlvbnMoLSkNCg0KZGlmZiAtLWdpdCBhL2d1aXgvc2NyaXB0cy9lbnZpcm9ubWVudC5zY20gYi9n dWl4L3NjcmlwdHMvZW52aXJvbm1lbnQuc2NtDQppbmRleCBjN2ZkOGZkMzQwLi4xOWJhMmY3YmVl IDEwMDY0NA0KLS0tIGEvZ3VpeC9zY3JpcHRzL2Vudmlyb25tZW50LnNjbQ0KKysrIGIvZ3VpeC9z Y3JpcHRzL2Vudmlyb25tZW50LnNjbQ0KQEAgLTIsNyArMiw3IEBADQogOzs7IENvcHlyaWdodCDC qSAyMDE0LCAyMDE1LCAyMDE4IERhdmlkIFRob21wc29uIDxkYXZldEBnbnUub3JnPg0KIDs7OyBD b3B5cmlnaHQgwqkgMjAxNS0yMDIyIEx1ZG92aWMgQ291cnTDqHMgPGx1ZG9AZ251Lm9yZz4NCiA7 OzsgQ29weXJpZ2h0IMKpIDIwMTggTWlrZSBHZXJ3aXR6IDxtdGdAZ251Lm9yZz4NCi07OzsgQ29w eXJpZ2h0IMKpIDIwMjIgSm9obiBLZWhheWlhcyA8am9obi5rZWhheWlhc0Bwcm90b25tYWlsLmNv bT4NCis7OzsgQ29weXJpZ2h0IMKpIDIwMjIsIDIwMjMgSm9obiBLZWhheWlhcyA8am9obi5rZWhh eWlhc0Bwcm90b25tYWlsLmNvbT4NCiA7OzsNCiA7OzsgVGhpcyBmaWxlIGlzIHBhcnQgb2YgR05V IEd1aXguDQogOzs7DQpAQCAtNDc1LDEwICs0NzUsMTIgQEAgKGRlZmluZSogKGxhdW5jaC1lbnZp cm9ubWVudCBjb21tYW5kIHByb2ZpbGUgbWFuaWZlc3QNCiAgICAgIChjYXRjaCAnc3lzdGVtLWVy cm9yDQogICAgICAgIChsYW1iZGEgKCkNCiAgICAgICAgICAod2hlbiBlbXVsYXRlLWZocz8NCi0g ICAgICAgICAgIDs7IFdoZW4gcnVubmluZyBpbiBhIGNvbnRhaW5lciB3aXRoIEVNVUxBVEUtRkhT Pywgb3ZlcnJpZGUgJFBBVEgNCisgICAgICAgICAgIDs7IFdoZW4gcnVubmluZyBpbiBhIGNvbnRh aW5lciB3aXRoIEVNVUxBVEUtRkhTPywgYXVnbWVudCAkUEFUSA0KICAgICAgICAgICAgOzsgKG9w dGlvbmFsLCBidXQgdG8gYmV0dGVyIG1hdGNoIEZIUyBleHBlY3RhdGlvbnMpLCBhbmQgZ2VuZXJh dGUNCiAgICAgICAgICAgIDs7IC9ldGMvbGQuc28uY2FjaGUuDQotICAgICAgICAgICAoc2V0ZW52 ICJQQVRIIiAiL2JpbjovdXNyL2Jpbjovc2JpbjovdXNyL3NiaW4iKQ0KKyAgICAgICAgICAgKHNl dGVudiAiUEFUSCIgKHN0cmluZy1hcHBlbmQgIi9iaW46L3Vzci9iaW46L3NiaW46L3Vzci9zYmlu Ig0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHdoZW4gKGdldGVu diAiUEFUSCIpDQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChz dHJpbmctYXBwZW5kICI6IiAoZ2V0ZW52ICJQQVRIIikpKSkpDQogICAgICAgICAgICAoaW52b2tl ICJsZGNvbmZpZyIgIi1YIikpDQogICAgICAgICAgKGFwcGx5IGV4ZWNscCBwcm9ncmFtIHByb2dy YW0gYXJncykpDQogICAgICAgIChsYW1iZGEgXw0KZGlmZiAtLWdpdCBhL3Rlc3RzL2d1aXgtZW52 aXJvbm1lbnQtY29udGFpbmVyLnNoIGIvdGVzdHMvZ3VpeC1lbnZpcm9ubWVudC1jb250YWluZXIu c2gNCmluZGV4IDAzMDZmYzE3NDQuLjE5ODM1MmMxZTIgMTAwNjQ0DQotLS0gYS90ZXN0cy9ndWl4 LWVudmlyb25tZW50LWNvbnRhaW5lci5zaA0KKysrIGIvdGVzdHMvZ3VpeC1lbnZpcm9ubWVudC1j b250YWluZXIuc2gNCkBAIC0xLDYgKzEsNiBAQA0KICMgR05VIEd1aXggLS0tIEZ1bmN0aW9uYWwg cGFja2FnZSBtYW5hZ2VtZW50IGZvciBHTlUNCiAjIENvcHlyaWdodCDCqSAyMDE1IERhdmlkIFRo b21wc29uIDxkYXZldEBnbnUub3JnPg0KLSMgQ29weXJpZ2h0IMKpIDIwMjIgSm9obiBLZWhheWlh cyA8am9obi5rZWhheWlhc0Bwcm90b25tYWlsLmNvbT4NCisjIENvcHlyaWdodCDCqSAyMDIyLCAy MDIzIEpvaG4gS2VoYXlpYXMgPGpvaG4ua2VoYXlpYXNAcHJvdG9ubWFpbC5jb20+DQogIw0KICMg VGhpcyBmaWxlIGlzIHBhcnQgb2YgR05VIEd1aXguDQogIw0KQEAgLTI0Miw2ICsyNDIsMjIgQEAg Z3VpeCBzaGVsbCAtQ0YgLS1ib290c3RyYXAgZ3VpbGUtYm9vdHN0cmFwIGdsaWJjIFwNCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAwDQogICAgICAgICAgICAgICAgICAgICAgICAgICAgMSkp Jw0KIA0KKyMgVGVzdCB0aGF0ICRQQVRIIGluc2lkZSB0aGUgY29udGFpbmVyIGhhcyBGSFMgZGly ZWN0b3JpZXMuDQorZ3VpeCBzaGVsbCAtQ0YgLS1ib290c3RyYXAgZ3VpbGUtYm9vdHN0cmFwIFwN CisgICAgIC0tIGd1aWxlIC1jICcoZXhpdCAoaWYgKHN0cmluZy1jb250YWlucyAoZ2V0ZW52ICJQ QVRIIikNCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIi9iaW46L3Vzci9iaW46L3NiaW46 L3Vzci9zYmluIikNCisgICAgICAgICAgICAgICAgICAgICAgICAgICAwDQorICAgICAgICAgICAg ICAgICAgICAgICAgICAgMSkpJw0KKw0KKyMgTWFrZSBzdXJlICctLXByZXNlcnZlJyBpcyBob25v cmVkIGZvciAkUEFUSCwgd2hpY2ggdGhlICctLWVtdWxhdGUtZmhzJw0KKyMgb3B0aW9uIHdpbGwg bW9kaWZ5LiAgV2UgY2FuJ3QgKGVhc2lseSkgY2hlY2sgdGhlIHdob2xlICRQQVRIIGFzIGl0IHdp bGwNCisjIGRpZmZlciBpbnNpZGUgYW5kIG91dHNpZGUgdGhlIGNvbnRhaW5lciwgc28ganVzdCBj aGVjayBmb3IgYW4gYWRkZWQgc3RyaW5nLg0KK1BBVEg9dGhpcy1pcy1hLXRlc3Q6JFBBVEggZ3Vp eCBzaGVsbCAtQ0YgLS1ib290c3RyYXAgZ3VpbGUtYm9vdHN0cmFwIC1FIFBBVEggXA0KKyAgICAg LS0gZ3VpbGUgLWMgJyhleGl0IChpZiAoc3RyaW5nLWNvbnRhaW5zIChnZXRlbnYgIlBBVEgiKQ0K KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAidGhpcy1pcy1hLXRlc3QiKQ0KKyAgICAgICAg ICAgICAgICAgICAgICAgICAgIDANCisgICAgICAgICAgICAgICAgICAgICAgICAgICAxKSknDQor DQogIyAnLS1zeW1saW5rJyB3b3Jrcy4NCiBlY2hvICJURVNUSU5HIFNZTUxJTksgSU4gQ09OVEFJ TkVSIg0KIGd1aXggc2hlbGwgLS1ib290c3RyYXAgZ3VpbGUtYm9vdHN0cmFwIC0tY29udGFpbmVy IFwNCi0tIA0KMi4zOC4xDQoNCg== --b1_KlcrGRoReiLt1KmLVaEgv37IIFJc5rU47J3DPQ8YQs8--