From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id SJmqKGvWJmXHtwAAauVa8A:P1 (envelope-from ) for ; Wed, 11 Oct 2023 19:07:55 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id SJmqKGvWJmXHtwAAauVa8A (envelope-from ) for ; Wed, 11 Oct 2023 19:07:55 +0200 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 4504C3E1F4 for ; Wed, 11 Oct 2023 19:07:55 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b="mxZ1F/xK"; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1697044075; a=rsa-sha256; cv=none; b=k8uxgxlC7OGpHXwROR/EaFdyeXCSP4fgdWJh8OEY2jz2ebONMzKDB3HKTIIKkkUnwaVUyH kd58JGLkNJrDC/1kOytjwQVVCX6eu4qJLbNqEtpasneJyeeBdPXefrYxx1jPhnG56aAIig q7ZR+Prl7QTcyrACbIieCsrlEVbYCSHjUadxjfOLRFpUxN+fFO3HBNtACfr/AW80fEn7Z5 Lpwn7mToxYrGSV7JNDmzkgN2APvw4CTa9tYVT8hQ9tJ0jm5CpWQqxdjJxuWbACTBIdhGpz WKRJntBkhBEp5ewk2xu+W7x25F1MDoZsp+XEcBzTeRou9lrdisxzVchXRRYlew== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b="mxZ1F/xK"; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1697044075; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: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=gIKwIr2ZMBae0yOJYKGlaqYOHmxwYiSnyfG1P3QTEmI=; b=h0AcQ+e69pbwMVIdE/yyM5YtkkMtOyu8pVxkR+jX/9qchR+8Ugh4x6TunlG2qZmvQblJmP JKj0aGilNIeu4SIZNOJRBiPC5ljOAest7/6YVNYmbjfucamzNNAkv8Ze/q1o1t5C5RZRGa CBS3sm7K9n2OJPv64sSL+bhj4/6AND45BPycSM/dYO/N73agVQ2OQFwPyOnuBVUH1h7LPL L3q6sT4Aesv6HB1TPvZFT4DK5WzKpl3q3aoP7vpF6Q4AppjyHn8QFVO+9HKC4JhV9nwfn9 rck9m5fq2z10e+n9wKiUNxArtgC4QpZR2V3VdU0npMAj4BkoRSZUclSrtc8bTQ== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qqcgW-0005hR-TR; Wed, 11 Oct 2023 13:07:48 -0400 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 1qqcgQ-0005gL-2u for guix-patches@gnu.org; Wed, 11 Oct 2023 13:07:43 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qqcgO-0004Ei-Us for guix-patches@gnu.org; Wed, 11 Oct 2023 13:07:41 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qqcgk-0000N7-GH for guix-patches@gnu.org; Wed, 11 Oct 2023 13:08:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64359] [PATCH] [RFC] --search-paths: emit code compatible with set -u Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 11 Oct 2023 17:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64359 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Zack Weinberg Cc: 64359@debbugs.gnu.org Received: via spool by 64359-submit@debbugs.gnu.org id=B64359.16970440291357 (code B ref 64359); Wed, 11 Oct 2023 17:08:02 +0000 Received: (at 64359) by debbugs.gnu.org; 11 Oct 2023 17:07:09 +0000 Received: from localhost ([127.0.0.1]:39936 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqcfs-0000Lo-JR for submit@debbugs.gnu.org; Wed, 11 Oct 2023 13:07:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59124) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqcfn-0000LC-ES for 64359@debbugs.gnu.org; Wed, 11 Oct 2023 13:07:06 -0400 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 1qqcfL-00045Q-Sk; Wed, 11 Oct 2023 13:06:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=gIKwIr2ZMBae0yOJYKGlaqYOHmxwYiSnyfG1P3QTEmI=; b=mxZ1F/xKFSe28QJxHvpl GZLXjkW4GU9GZO1/bOdrd87J/rI7WKT1f60ftTXsDatRYb36R/rW3jY1z3Ap7XPBatv681gQVoYFo R+cPuvzacJN2+r9HjE0D0awr2hzSeE1vx5G9fqqgh9CuKTbrBxIhW8JuGTLIYfMJKg7t3fT27lEYj KhFHtiSVxA/qNl//Wu29wVVYkr8YRmWGbvNCW4BxJCwK7ajTkdsdYdlPwwySn5RT4mchtdpbZ+0iU G/AmD3gTt0DWXdIV5XG6ZFSqRSWI2SBfRs+wgN+lCuxNwVp8R2EgKmln+kSfknjfqyeR+GNq7JbtU JI8NnfYcGf/f6Q==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= In-Reply-To: <877crlyidb.wl-zack@owlfolio.org> (Zack Weinberg's message of "Thu, 29 Jun 2023 19:10:56 -0400") References: <877crlyidb.wl-zack@owlfolio.org> Date: Wed, 11 Oct 2023 19:06:32 +0200 Message-ID: <87bkd5t7fr.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx1.migadu.com X-Migadu-Spam-Score: -6.92 X-Spam-Score: -6.92 X-Migadu-Queue-Id: 4504C3E1F4 X-TUID: 2RrOpaK6GuGV Hi Zack, Zack Weinberg skribis: > The shell script fragment emitted by the --search-paths option to > =E2=80=98guix shell=E2=80=99, etc., uses this construct to prepend a dire= ctory to > a search-path environment variable: > > export VAR=3D"/gnu/store/...${VAR:+:}$VAR" > > If this is evaluated by a shell in set -u mode, and VAR was previously > unset, it will error out: > > $ bash -c ' > set -u > unset PKG_CONFIG_PATH > export PKG_CONFIG_PATH=3D"/example/lib/pkgconfig${PKG_CONFIG_PATH= :+:}$PKG_CONFIG_PATH" > echo $PKG_CONFIG_PATH > ' > bash: line 4: PKG_CONFIG_PATH: unbound variable > > This happens in real life, for instance, if direnv[1] is being used in its > =E2=80=9Cstrict_env=E2=80=9D mode[2], which the documentation says will b= ecome the default > in a future release. > > This patch makes the code emitted by --search-paths compatible with set -= u, > by changing each use of bare `$VARIABLE` to `${VARIABLE:-}`, e.g. > > $ bash -c ' > set -u > unset PKG_CONFIG_PATH > export PKG_CONFIG_PATH=3D"/example/lib/pkgconfig${PKG_CONFIG_PATH= :+:}${PKG_CONFIG_PATH:-}" > echo $PKG_CONFIG_PATH' > /example/lib/pkgconfig This change makes a lot of sense to me. [...] > +++ b/guix/build/utils.scm > @@ -1384,19 +1384,19 @@ (define (export-variable lst) > (format #f "export ~a=3D\"~a\"" > var (string-join rest sep))) > ((var sep 'prefix rest) > - (format #f "export ~a=3D\"~a${~a:+~a}$~a\"" > + (format #f "export ~a=3D\"~a${~a:+~a}${~a:-}\"" > var (string-join rest sep) var sep var)) This part is a full-rebuild change, so it=E2=80=99d have to wait. However,= it=E2=80=99s within =E2=80=98wrap-program=E2=80=99; the script generated by =E2=80=98wra= p-program=E2=80=99 does *not* use =E2=80=98set -u=E2=80=99, so I think this change is unnecessary. Am I = right? > +++ b/guix/search-paths.scm > @@ -225,10 +225,10 @@ (define* (environment-variable-definition variable = value > ('exact > (format #f "export ~a=3D\"~a\"" variable value)) > ('prefix > - (format #f "export ~a=3D\"~a${~a:+~a}$~a\"" > + (format #f "export ~a=3D\"~a${~a:+~a}${~a:-}\"" > variable value variable separator variable)) > ('suffix > - (format #f "export ~a=3D\"$~a${~a:+~a}~a\"" > + (format #f "export ~a=3D\"${~a:-}${~a:+~a}~a\"" > variable variable variable separator value)))) LGTM. > --- a/tests/guix-environment.sh > +++ b/tests/guix-environment.sh You can remove this change and keep only the =E2=80=98tests/guix-shell.sh= =E2=80=99 part. Could you send an updated patch? Thanks, and apologies for the long delay! Ludo=E2=80=99.