From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id ADxVBQ1OH194WgAA0tVLHw (envelope-from ) for ; Mon, 27 Jul 2020 21:58:37 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id yF8xAQ1OH194FgAA1q6Kng (envelope-from ) for ; Mon, 27 Jul 2020 21:58:37 +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 36FDD9403C9 for ; Mon, 27 Jul 2020 21:58:36 +0000 (UTC) Received: from localhost ([::1]:52348 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0B8l-0007VS-4Q for larch@yhetil.org; Mon, 27 Jul 2020 17:58:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45724) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0AzW-0001z4-VK for bug-guix@gnu.org; Mon, 27 Jul 2020 17:49:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44349) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k0AzW-0002wv-MM for bug-guix@gnu.org; Mon, 27 Jul 2020 17:49:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k0AzW-00063K-Lz for bug-guix@gnu.org; Mon, 27 Jul 2020 17:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#42543: [PATCH 1/2] scripts: build: Canonicalize 'load-path' option. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Mon, 27 Jul 2020 21:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42543 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 42543@debbugs.gnu.org Received: via spool by 42543-submit@debbugs.gnu.org id=B42543.159588649923183 (code B ref 42543); Mon, 27 Jul 2020 21:49:02 +0000 Received: (at 42543) by debbugs.gnu.org; 27 Jul 2020 21:48:19 +0000 Received: from localhost ([127.0.0.1]:55888 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k0Aym-00061n-0V for submit@debbugs.gnu.org; Mon, 27 Jul 2020 17:48:19 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:50700) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k0Ayh-00061F-DW for 42543@debbugs.gnu.org; Mon, 27 Jul 2020 17:48:11 -0400 Received: by mail-wm1-f66.google.com with SMTP id c80so15435870wme.0 for <42543@debbugs.gnu.org>; Mon, 27 Jul 2020 14:48:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0ZcefAcIxvsW8NuQPJINH56XwNj6hYsoSlfWGPupQtM=; b=AnQ419y8g9jRBMym3ngiPJejkmT1a8JDj28ULf1aWNwUlNI0JBWYsHLRF85WdWUgqO ga/u6pk2Js4xt+ikiiIQyXTYb/gxFapUMABtG1kioASRTvDrPG3Vyws79yhN5QN0+ag5 XY1k9mv2xUzpJjnn4ml2ZIS8zmJKgf10uzAL6/gVs8AI75PTzj3PQqwi/U0OAQOH8aNa UjfpRNiMb5EcoK+4UPuS1sA3sLNIbw86HsILZ4ichIgI5k8H82lQ1oWVMLmBufihpf8y BrAGbCAi6Xomcmz4S22TYIeS7iIFCc3/PHpu+ADe6Tptw5hK4eyAblVjmdExMJjzF0ib FRtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0ZcefAcIxvsW8NuQPJINH56XwNj6hYsoSlfWGPupQtM=; b=D3XIAnfNV+h+gvnK/zT/fnl87RyO/fNmVTUeQSzUHaKQI5Jp1orK1rJPJSoMHTlc/R KZh0h8sItTFBKyQF7eJeU8hwKR6pFfsrNh6qxH2p50jBNbqSHIEE+Zk0pb2W+nOq5Jjc Fh/COnSdxsurQY9/Pl6WYtOXVX25gzKCtk/7Eyued/N1AlMHV5UUvuYbjlmG7POfpksQ xDHzehnfZA0yFlbDeyFzWkVBgz3Q8GsZmTGPQfhXyoCBs1EDzI2mnRdNgNn4xySTihZv EFK0sfppJ0PzFeVYPDuGvV1lEYYtx+7oGzqtqrKtb9ZhTDJrWREUTgalBp78BhFPYaS5 c2Jg== X-Gm-Message-State: AOAM533in0ym+3nuGVJ1ne/0tJ0/sSL+qemkSNE10/Eq6JS/2J3flTCn ISmpm5E/dYRkXjw17eIoThLKm831 X-Google-Smtp-Source: ABdhPJyjoRWsf0d+wnFP+KNsL7fDZWDzkf/veTEy4NS1Xs8SJLkCwRgEr7fbhmM/83MpocG60ZRFzQ== X-Received: by 2002:a1c:e382:: with SMTP id a124mr991612wmh.96.1595886485531; Mon, 27 Jul 2020 14:48:05 -0700 (PDT) Received: from lili.univ-paris-diderot.fr ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id g25sm1024388wmh.35.2020.07.27.14.48.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jul 2020 14:48:04 -0700 (PDT) From: zimoun Date: Mon, 27 Jul 2020 23:47:53 +0200 Message-Id: <20200727214754.14297-2-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200727214754.14297-1-zimon.toutoune@gmail.com> References: <20200727214754.14297-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=gmail.com header.s=20161025 header.b=AnQ419y8; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Spam-Score: 0.09 X-TUID: Thuz6OsDGELC Fixes . Reported by Jack Hill . * guix/scripts/build.scm (%standard-build-options): Canonicalize 'load-path'. --- guix/scripts/build.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm index 8ff2fd1910..f41221dd43 100644 --- a/guix/scripts/build.scm +++ b/guix/scripts/build.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2013 Mark H Weaver ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Ricardo Wurmus +;;; Copyright © 2020 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -568,10 +569,11 @@ talking to a remote daemon\n"))) (list (option '(#\L "load-path") #t #f (lambda (opt name arg result . rest) ;; XXX: Imperatively modify the search paths. - (%package-module-path (cons arg (%package-module-path))) - (%patch-path (cons arg (%patch-path))) - (set! %load-path (cons arg %load-path)) - (set! %load-compiled-path (cons arg %load-compiled-path)) + (let ((path (canonicalize-path arg))) + (%package-module-path (cons path (%package-module-path))) + (%patch-path (cons path (%patch-path))) + (set! %load-path (cons path %load-path)) + (set! %load-compiled-path (cons path %load-compiled-path))) (apply values (cons result rest)))) (option '(#\K "keep-failed") #f #f base-commit: 7b58d009a952e0c36446a0a5d06582f1e9822bb6 -- 2.26.2