From patchwork Tue Dec 27 21:26:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 45608 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A9E2E27BBEB; Tue, 27 Dec 2022 21:27:50 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1752F27BBE9 for ; Tue, 27 Dec 2022 21:27:49 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pAHTW-0001Fc-6y; Tue, 27 Dec 2022 16:27:06 -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 1pAHTT-0001Eq-FO for guix-patches@gnu.org; Tue, 27 Dec 2022 16:27:03 -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 1pAHTT-00040q-6D for guix-patches@gnu.org; Tue, 27 Dec 2022 16:27:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pAHTT-0007tU-1X for guix-patches@gnu.org; Tue, 27 Dec 2022 16:27:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60365] [PATCH 4/4] environment: Avoid false positive on 'PS1' check. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 27 Dec 2022 21:27:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60365 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60365@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 60365-submit@debbugs.gnu.org id=B60365.167217640030293 (code B ref 60365); Tue, 27 Dec 2022 21:27:03 +0000 Received: (at 60365) by debbugs.gnu.org; 27 Dec 2022 21:26:40 +0000 Received: from localhost ([127.0.0.1]:56609 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAHT5-0007sS-RU for submit@debbugs.gnu.org; Tue, 27 Dec 2022 16:26:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52368) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAHT0-0007rg-Jd for 60365@debbugs.gnu.org; Tue, 27 Dec 2022 16:26:34 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pAHSv-0003xU-Cz; Tue, 27 Dec 2022 16:26:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=mFnGOYrRMxmh7l+dvRYR9J5Hwr/OR0s9vi0mN6SICo0=; b=UtZdI3nlYlHVCiBz3c5b WPM2cHU3TBxVz7ofkp/O/1+z/HLG3T9zlc4gnoJCDrcqLQNfXlpge54XNtgcTtiwCRipytW2t56EY 0vZtBR/rT4jkKVBGAfCJ0KdCQfJERA3dYOUxUr3EKOu/AP6wNg0ij0xhk0LXSZBZxVGbx5x/kbTgN OzXyFVuo4EbUk+SYVBd8cJOpN9IVJNtj6k9wl7+TmltL5NuuDxtaTYCmP0cB3lICGmgbdcCL1Jx80 ex06igMTWRdwfpSlN7WiE4iIbKzcsH/PdUAi8lPL+vwRCFLeTIfJt6/ID2o4i2KnV411MSwfYVecK OBtZSt9h6HG4GQ==; Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pAHSv-0007DL-1C; Tue, 27 Dec 2022 16:26:29 -0500 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Tue, 27 Dec 2022 22:26:18 +0100 Message-Id: <20221227212618.18063-4-ludo@gnu.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221227212618.18063-1-ludo@gnu.org> References: <20221227212618.18063-1-ludo@gnu.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/scripts/environment.scm (validate-child-shell-environment): Do not warn when 'PS1' refers to 'GUIX_ENVIRONMENT'. --- guix/scripts/environment.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm index bdbfa03fcf..c7fd8fd340 100644 --- a/guix/scripts/environment.scm +++ b/guix/scripts/environment.scm @@ -601,7 +601,12 @@ (define-syntax-rule (warn exp ...) (match (vhash-assoc "PS1" actual) (#f #f) ((_ . str) - (when (and (getenv "PS1") (string=? str (getenv "PS1"))) + (when (and (getenv "PS1") (string=? str (getenv "PS1")) + + ;; 'PS1' might be conditional on 'GUIX_ENVIRONMENT', as + ;; shown in the hint below. + (not (or (string-contains str "$GUIX_ENVIRONMENT") + (string-contains str "${GUIX_ENVIRONMENT")))) (warning (G_ "'PS1' is the same in sub-shell~%")) (display-hint (G_ "Consider setting a different prompt for environment shells to make them distinguishable.