From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id eGqpCgiyBWDbYgAA0tVLHw (envelope-from ) for ; Mon, 18 Jan 2021 16:06:32 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id oLR8BgiyBWAdbgAAB5/wlQ (envelope-from ) for ; Mon, 18 Jan 2021 16:06:32 +0000 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 F3832940548 for ; Mon, 18 Jan 2021 16:06:30 +0000 (UTC) Received: from localhost ([::1]:46724 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l1X2z-0000gX-U3 for larch@yhetil.org; Mon, 18 Jan 2021 11:06:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37644) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1QJV-0006Dp-J6 for guix-patches@gnu.org; Mon, 18 Jan 2021 03:55:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:34742) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l1QJS-0001hQ-5t for guix-patches@gnu.org; Mon, 18 Jan 2021 03:55:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l1QJS-0001BO-5P for guix-patches@gnu.org; Mon, 18 Jan 2021 03:55:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45953] [PATCH] environment: fix --root option with relative path Resent-From: JOULAUD =?UTF-8?Q?Fran=C3=A7ois?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Jan 2021 08:55:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 45953 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45953@debbugs.gnu.org X-Debbugs-Original-To: "guix-patches@gnu.org" Received: via spool by submit@debbugs.gnu.org id=B.16109600764503 (code B ref -1); Mon, 18 Jan 2021 08:55:01 +0000 Received: (at submit) by debbugs.gnu.org; 18 Jan 2021 08:54:36 +0000 Received: from localhost ([127.0.0.1]:46285 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l1QJ0-0001AV-55 for submit@debbugs.gnu.org; Mon, 18 Jan 2021 03:54:36 -0500 Received: from lists.gnu.org ([209.51.188.17]:48824) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l1PrY-0000Un-GG for submit@debbugs.gnu.org; Mon, 18 Jan 2021 03:26:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59374) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1PrY-00078E-79 for guix-patches@gnu.org; Mon, 18 Jan 2021 03:26:12 -0500 Received: from mx08-00115501.pphosted.com ([91.207.212.23]:12624) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1PrU-0004cF-RI for guix-patches@gnu.org; Mon, 18 Jan 2021 03:26:11 -0500 Received: from pps.filterd (m0030078.ppops.net [127.0.0.1]) by mx08-00115501.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 10I8PUX1028354 for ; Mon, 18 Jan 2021 09:26:04 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=radiofrance.com; h=from : to : subject : date : message-id : content-type : content-id : content-transfer-encoding : mime-version; s=radiofrance20190306; bh=xEvn9GsDZ5fnhqUAPU9eZvLRe42UaqIShjI09A29I20=; b=f2sKlMUcKvaVrFQpMejhY5Yun64JukBhU451bbhsPW+wegDQEfPJMxeAzrM1wNeldqU5 xiV1DXf7A/MV0MjFxeRQWJwvSxDLY4qtUvnjEoBikjU6/CS4OcLziaN8Gin0VPhjVva4 jaG/pRjq/0iJsIEEbFi+oR8lYbmKIJtVmOnebU0FKdF+uBljFBtOPIU1WBVDGTG8aPCd mCoGQ2bsBo5QJ4ICvsylfyR8lCuEIuEWzIc8hRixLyhlyCkPStiwfqf5/nAq46+OnqYe RpLEddGRWSh7yDdVkRas0Gla/YTyYXQLjHuUso/W9CfOjMdDt6JuzDg0kkUEwRTfIyeq mA== Received: from fra01-pr2-obe.outbound.protection.outlook.com (mail-pr2fra01lp0102.outbound.protection.outlook.com [104.47.24.102]) by mx08-00115501.pphosted.com with ESMTP id 363mq0aa6q-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 18 Jan 2021 09:26:04 +0100 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BbF7PjAnPTYlEOJuHDFaKzV1U6/qP+LnF9aYtu4zKC9xzGK8SmKnZMenHqQpPSBG/BkAv3t7wETUK0I/0JgUsDyT9SvKv27H2ukgTgBpPhXbPLaAVavGLab3blAInHn3m3ZQ0M91Eei6OSQruCR2nvxFrbiOdmZNpAdH2b2eBcEMqho1FkVcY4hlMaqsDdJnsgZJwno+/fLBFc6tPvh4h+u/kpLZ9yZ6h+J8GCV/tdhVNvY0wj4eldpm7pDKvD8DrZaQKnp4VQtppjk9PAdHNAaVl1HXAhTpGvACxN8oxI60cx0CKf5jWSZcRETPaqacfjRMP0WcJFwZePKaprpnIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xEvn9GsDZ5fnhqUAPU9eZvLRe42UaqIShjI09A29I20=; b=IzzPH9h37tPgH5yrEb5iCodapd9baV4QR3BJAd6ONwl2mqeCI3H5/Bdy+Q6IaABB7dKtpLG/+QgjD+POJsS9WFBTVsHMjoukvcjB+BT6mJEZi/iTeJWE/uWRvNMey6LTPQPJE1MiI0TF43fVi2NX/R8zoFOiBJq/PIN3PlXnsBuBxk/QjVfDtScwdBm/MNpthy/zkIUmHK6umnA8Y+7Nf16Ur/yaVjBzlgcOQt1XfzR1IISfERLiRn+M619lrlImaqilOvyLsEYOVpUoTLgnTRKoBngNtp7CAzd9oCZ4Qcu5JXmY8lLuAxPH2cgh5zsF9l6U7gf4T6MUQgIfPFVGyQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=radiofrance.com; dmarc=pass action=none header.from=radiofrance.com; dkim=pass header.d=radiofrance.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=RFonline.onmicrosoft.com; s=selector2-RFonline-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xEvn9GsDZ5fnhqUAPU9eZvLRe42UaqIShjI09A29I20=; b=iX58H3+F+AqkzICfn1PMHaP8031V5vdrA7/7Ar5rJfQj6gAU5ZFG3Ljz48DVAp3ui9LrF7ZshkOEuJ3Boj8o9BfEb+B0OmiCNSnHAqAWlQ2DOpiqP6tpJIxfl9hfQcvJq9iDqJjJ3yZJp0hCV0kuj7eYqGni+bFFLiwVcgUKqx4= Received: from PR0P264MB0425.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:b::20) by PR0P264MB0700.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:10::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3763.13; Mon, 18 Jan 2021 08:26:03 +0000 Received: from PR0P264MB0425.FRAP264.PROD.OUTLOOK.COM ([fe80::9b7:6491:8aa7:550b]) by PR0P264MB0425.FRAP264.PROD.OUTLOOK.COM ([fe80::9b7:6491:8aa7:550b%3]) with mapi id 15.20.3763.013; Mon, 18 Jan 2021 08:26:02 +0000 Thread-Topic: [PATCH] environment: fix --root option with relative path Thread-Index: AQHW7XOOkTPfzcYV5EODBr2T6j9Swg== Date: Mon, 18 Jan 2021 08:26:02 +0000 Message-ID: <20210118082300.phr55ee5chgwmptl@fjo-extia-HPdeb.example.avalenn.eu> Accept-Language: fr-FR, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [88.126.13.52] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 8fc5a7fd-5588-4607-93bf-08d8bb8ab169 x-ms-traffictypediagnostic: PR0P264MB0700: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:1360; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: PDquYvH7QK878rA5maDyuvatuf+qsMYVnF7dAknCxOBOvLj1UyFZ693GZsHhJ7s4xmJ1ggiew5A9U3rOD6Nq2bCaq2tRtI5ArQyKbRhU51RH3wpX27U3o+TjNe19T5r/zhFF3CdtX4NN1W5oFYoFa7c7QPN98ELD2xXXxzi16tmucOO5rGfDkfSsL1P/aams0seZUdzZaeAkqHMvPxuA/nVHmRn65Y0AZTzhLeKi/MbBo1EDaSQkjg2JP7+6+E0e3onlRsiUdhf6NJjOzgkUbO0E9YiCc3M4jgquNNE2cBjt6GAVFCvkfw7Vg74rL3hhH46EroQtz9liWd5MleNTW8O7veT58d4jDnvD8Ozke9YW+lueT6PLQsKFuIKLYcCdxii4qdekpqdl/pFGgSMqbw== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PR0P264MB0425.FRAP264.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(4636009)(39850400004)(346002)(376002)(136003)(396003)(366004)(186003)(86362001)(66946007)(71200400001)(83380400001)(6486002)(6506007)(8936002)(8676002)(1076003)(5660300002)(76116006)(66446008)(4744005)(6916009)(26005)(64756008)(66556008)(66476007)(2906002)(316002)(6512007)(9686003)(478600001); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata: 7aUppPrZtYnW+FA4RQn21lc4fYeZX47gtCP//bpdIuxDJ+WW5k8SFR9H7aBI26OLXXpxtJ/nPoJQ/Gf7U9OkXo08AvzNqMs343Q/FDdFCJyydeeuKVoSrye/tfh6VAXHM4kOiZfM9gsqy0Qzxwf+XPZrDrK+IQR644vwoIWATT+lXN3pmKN3LHBOpaXCxV5a+7astErtPyTKx8kAkU/IIR80Ff9KagzYdMAltxduzMqBzwOR0lQj4lIWUOPINOaRVwIEw5rgOTPhW1pdz7cL9siP8ZpPUGWiUgxF69AYAmRI77mKIczy3CaME9zWTGKd4JMd7a4iH/L7GOP6CJkmoERs05+QljUWhxuMF8ibduoMWY0J5WsZAcZv3ok8yAYNvVyfNauHKp7wfEGle9M96QPGqb0WN1rKeNnOYY8E59COZGZfR0ELEA5HkbrkAG0k53w8+LxYozl+9yYSEzQPBncA4lDMf15IIqFQ8BnH/YKRf+Zvf+5DCWUaJgcn77Th+NKkrm8/iAxfh7bsqtjFT8XC3nytATfiB/qm60+ED9jjReKRFJr8pd7XKCHh8oDo5N44t9pxiClGXeyb56+9Vz2o94BI1PCHgtRgtIovpn1+dGxB3wtQ2JkuIHFNFMKd4GlD+4/3itdXF2q0njKrQiRrLTRCpTKhPzCWiWodf6PxOs/BfMQmloYuxN01vixeHaoHGSbOaUd8vStauS/Qi63lzrtEoFECvbR1zzqtXuuu72tH8DTKeh9O3R9CLIgARZBOtSKHaC7s4f3LBVW23sfi2s0qpU5F4hoz+jdGimZAeXP2Kind3K6AlJTZx9w0im07wgx9OyckA2codc6M2kbBXap8tn7NqBg9gwJgyQGE5eiCrqe79uLQ4bbIJ0DCsNPpXtBvGI46dQ7oazRVNLa23/zc8eGzyysj6PBxAd/Qjd+PqHBV8QPYKhgda4XQix /GXzok6HMbkfcmIbBwKZqRDLP+XaKaXATgQMNYmnIh+ja9puVk44jhnjlvwJr6 Content-Type: text/plain; charset="iso-8859-1" Content-ID: <51523CF864F89347A618BB9F6308D7BC@FRAP264.PROD.OUTLOOK.COM> Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: radiofrance.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PR0P264MB0425.FRAP264.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: 8fc5a7fd-5588-4607-93bf-08d8bb8ab169 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Jan 2021 08:26:02.8702 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 1d643b07-8cf5-4e2d-ad1e-86d6b948fc3b X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: mvx4kgw9nrODdB9iFlTZ3Zgd1pb76ylOhBdk0Ifzq/nPs/hgPFPJVPS/EHHO1x2I5MFYUPGqHbXKKZbMU526MXZKKik1wmYHNPAGAPMYFpvoKpPeTcZ1YAIDJy5IxPZL X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR0P264MB0700 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.343, 18.0.737 definitions=2021-01-18_07:2021-01-15, 2021-01-18 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 phishscore=0 priorityscore=1501 suspectscore=0 adultscore=0 malwarescore=0 impostorscore=0 lowpriorityscore=0 bulkscore=0 clxscore=1011 mlxscore=0 mlxlogscore=602 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2101180050 Received-SPF: pass client-ip=91.207.212.23; envelope-from=prvs=8652e8b8a9=francois.joulaud@radiofrance.com; helo=mx08-00115501.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Mon, 18 Jan 2021 03:54:32 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Mon, 18 Jan 2021 11:06:03 -0500 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" Reply-to: JOULAUD =?UTF-8?Q?Fran=C3=A7ois?= X-ACL-Warn: , JOULAUD =?UTF-8?Q?Fran=C3=A7ois?= via Guix-patches From: guix-patches--- via X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -0.86 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=radiofrance.com header.s=radiofrance20190306 header.b=f2sKlMUc; dkim=fail ("headers rsa verify failed") header.d=RFonline.onmicrosoft.com header.s=selector2-RFonline-onmicrosoft-com header.b=iX58H3+F; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}"); dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: F3832940548 X-Spam-Score: -0.86 X-Migadu-Scanner: scn1.migadu.com X-TUID: OjHz17Wi0zi3 The path normalization of `--root` option of `guix environment` was buggy as it appended full argument after normalized directory. This patch fixes it. * guix/scripts/environment.scm: fix gc-root path normalization Signed-off-by: Francois Joulaud --- guix/scripts/environment.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm index fbc202c658..f4d12f89bf 100644 --- a/guix/scripts/environment.scm +++ b/guix/scripts/environment.scm @@ -675,7 +675,7 @@ message if any test fails." (let* ((root (if (string-prefix? "/" root) root (string-append (canonicalize-path (dirname root)) - "/" root)))) + "/" (basename root))))) (catch 'system-error (lambda () (symlink target root) --=20 2.28.0=