From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:5f26::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id KL8OIx+5m2UxUgAAkFu2QA (envelope-from ) for ; Mon, 08 Jan 2024 09:58:07 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id SC2BHR+5m2UcqwAAqHPOHw (envelope-from ) for ; Mon, 08 Jan 2024 09:58:07 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=inria.fr header.s=dc header.b=VrOX50SI; 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"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=inria.fr (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1704704287; 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=qiv6l0WKBR17FyKc5UefPFF0ttfKMQff1YD045NDExI=; b=A1xOjHAqlM8JTtVZ4IpBI2MW3lKf1s3kWBAVsaQxj7BkzjBgG9+fulD+pTHF4ywnjGFxkr RzA/yrr7rx9cnZsjHX1oJn5ZZZzNtAj6orb/4hw8aOkLVWInlpTX4UVRLoEY2MOY0nyvON ZOj3C3RU+euZyzI4cMDoHUJGfQ+VJoNB/76oKjTcfmqXFsE7luOsUOQtC0QM09dSy2XMNE DvZw8gcjI7PX8W/4vVkq0HT3cH0B69QNqU2panBcMdX/jqFpafWRu37kEBFxZaldblWWXD WfKomLm8Oefl3LglpIsJ7wr5xgFSGRzCramDv0/v+wfU3uwn2D8FNWjtln7RZw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1704704287; a=rsa-sha256; cv=none; b=rRrLeImFIA4IJT5aSdr5WefmLigEOGPvU6xxEWOSxz8MUWQLiux92EpbYmR8h3xVIf3iTj NArawEPCX6k5AFoaCM6rG2d+KOH3NHlE1r2WH62O57pqnaJedgOYUD4tQ8Wst1zxx/0nYR dZOwZHKmVvLcJT5kAztdvEztFqbMVOvus+jlCKWR/MGEvQKmZ6UCX0o1e72PVI8/n0C8vV 4YvJpR1QBwcIwcIh2F5cGH8UcpBPxSQ1tKTvK3p5KtWg8TwU3xzH+6+NWjhhm+v0xqw+mb M03AQ4KtGXXfJ5flNCYkHRzFNLpOLyFGDdQZet8F1qFLzL+EmDqpgL4NGFmfRQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=inria.fr header.s=dc header.b=VrOX50SI; 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"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=inria.fr (policy=none) 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 40A4B5802E for ; Mon, 8 Jan 2024 09:58:07 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMlSI-00051M-Aj; Mon, 08 Jan 2024 03:57:58 -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 1rMlSG-00051D-8u for guix-patches@gnu.org; Mon, 08 Jan 2024 03:57:56 -0500 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 1rMlSG-0001Ax-0E for guix-patches@gnu.org; Mon, 08 Jan 2024 03:57:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rMlSM-0000R3-1u for guix-patches@gnu.org; Mon, 08 Jan 2024 03:58:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68241] [PATCH] gnu: python: Fix sitecustomize.py Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jan 2024 08:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68241 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Konrad Hinsen Cc: Josselin Poiret , 68241@debbugs.gnu.org Received: via spool by 68241-submit@debbugs.gnu.org id=B68241.17047042581639 (code B ref 68241); Mon, 08 Jan 2024 08:58:02 +0000 Received: (at 68241) by debbugs.gnu.org; 8 Jan 2024 08:57:38 +0000 Received: from localhost ([127.0.0.1]:35154 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMlRy-0000QN-5K for submit@debbugs.gnu.org; Mon, 08 Jan 2024 03:57:38 -0500 Received: from mail3-relais-sop.national.inria.fr ([192.134.164.104]:62029) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMlRw-0000Q6-5m for 68241@debbugs.gnu.org; Mon, 08 Jan 2024 03:57:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inria.fr; s=dc; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version:content-transfer-encoding; bh=qiv6l0WKBR17FyKc5UefPFF0ttfKMQff1YD045NDExI=; b=VrOX50SISE0azSyQeST0TUj/CZO7gcXMO/XdQlby1qVF2DjMo0p/eSzx 38lzZ7GORVQrq6fJVjVxwnxToMrsmf0nePtxt2lmMojzQN+aUudYam/lX WaoWIBTc9UY43Q+WfzFK3yJrS0EC62ajBoXpLSPxDCX7ZLPCzjkOXHSGO 4=; X-IronPort-AV: E=Sophos;i="6.04,340,1695679200"; d="scan'208";a="76094382" Received: from unknown (HELO ribbon) ([193.50.110.52]) by mail3-relais-sop.national.inria.fr with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jan 2024 09:57:24 +0100 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= In-Reply-To: (Konrad Hinsen's message of "Thu, 04 Jan 2024 13:44:19 +0100") References: Date: Mon, 08 Jan 2024 09:57:23 +0100 Message-ID: <87o7dw6w3w.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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -5.19 X-Spam-Score: -5.19 X-Migadu-Queue-Id: 40A4B5802E X-Migadu-Scanner: mx11.migadu.com X-TUID: EgxoYjgRyIlh Hi Konrad! Konrad Hinsen skribis: > * gnu/packages/aux-files/python/sitecustomize.py: normalize sys.prefix > to deal with situations where it contains "../" > > This happens in particular when running Python from a Singularity image > created by Guix. See https://issues.guix.gnu.org/53258. > > Change-Id: Ibfe13d7c2a14beaa199f599e64bc0b7bfb500fe8 > --- > gnu/packages/aux-files/python/sitecustomize.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/gnu/packages/aux-files/python/sitecustomize.py b/gnu/package= s/aux-files/python/sitecustomize.py > index e2348e0356..82ea91104d 100644 > --- a/gnu/packages/aux-files/python/sitecustomize.py > +++ b/gnu/packages/aux-files/python/sitecustomize.py > @@ -37,7 +37,7 @@ import sys > major_minor =3D '{}.{}'.format(*sys.version_info) > site_packages_prefix =3D os.path.join( > 'lib', 'python' + major_minor, 'site-packages') > -python_site =3D os.path.join(sys.prefix, site_packages_prefix) > +python_site =3D os.path.normpath(os.path.join(sys.prefix, site_packages_= prefix)) IIRC Josselin had a patch for , but I can=E2=80=99t find it. Josselin? Also, do I get it right that the patch you sent fixes more than #53258? Thanks! Ludo=E2=80=99.