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 7rF9CChNH19CaQAA0tVLHw (envelope-from ) for ; Mon, 27 Jul 2020 21:54:48 +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 yEY4BChNH18tHQAAB5/wlQ (envelope-from ) for ; Mon, 27 Jul 2020 21:54:48 +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 CCEC69403C9 for ; Mon, 27 Jul 2020 21:54:47 +0000 (UTC) Received: from localhost ([::1]:48796 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0B54-0005g4-SE for larch@yhetil.org; Mon, 27 Jul 2020 17:54:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45726) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0AzX-0001zQ-CB for bug-guix@gnu.org; Mon, 27 Jul 2020 17:49:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44350) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k0AzX-0002wz-2L for bug-guix@gnu.org; Mon, 27 Jul 2020 17:49:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k0AzX-00063R-1Z for bug-guix@gnu.org; Mon, 27 Jul 2020 17:49:03 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#42543: [PATCH 2/2] scripts: repl: 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:03 +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.159588650023189 (code B ref 42543); Mon, 27 Jul 2020 21:49:03 +0000 Received: (at 42543) by debbugs.gnu.org; 27 Jul 2020 21:48:20 +0000 Received: from localhost ([127.0.0.1]:55890 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k0Ayp-00061s-NZ for submit@debbugs.gnu.org; Mon, 27 Jul 2020 17:48:19 -0400 Received: from mail-wr1-f43.google.com ([209.85.221.43]:39965) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k0Ayj-00061H-AM for 42543@debbugs.gnu.org; Mon, 27 Jul 2020 17:48:13 -0400 Received: by mail-wr1-f43.google.com with SMTP id l2so5745600wrc.7 for <42543@debbugs.gnu.org>; Mon, 27 Jul 2020 14:48:13 -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=gF+AQphtqhQZ6/cs+tYhef/Q0jckO/a1JgyGt1qyCi0=; b=S+eAK6CITlOpQSYwLoONdwgNVBarN6cOii+qSZ7NoQrHdT8P+h6rmt10+u6oDCHIDQ v5ArqtZuSlfahrSTSuu7D9MtJyHmnU1NALmGkUGqCnLHTSK+Gn5up5Iasa2v57rN3qHU QRX686Rh5AllqjE91CpRVhwEILEIbytGbHdOIXsqWQ1W8LQ+kLFLWUdJVeIrV7FvPiTj iS68/ymMU/natLmIC9/8dbkl1gjR4eL4QhThXvSctBMsJ6OyxxAhq8ENXj7J1bw/Ku1c SHVI6qqbfdqRRC5YKQRSCwvJsH+zMCx7+LlzydN5DWcqo/o/t6L2DuQe5FzjuytXImiq 5lBg== 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=gF+AQphtqhQZ6/cs+tYhef/Q0jckO/a1JgyGt1qyCi0=; b=U9K5E9elJfwtLgc8a0IRMeK3+WbhmP3YFcX5mdS/uhWNu7rCZeT7XTaxNcEcS4V2Cj /eswvn0R4gYQbmN8xTUAmlfT/3tu9FUl5/W6MMs42tbKWnothniwd2hlj4i7A9zD/rfg P0ZriQAAsueA7lyWrPWvIVXEgbQIkmUFptBDBWbuOw99dfqvmJeYwMdswEOqlrXApIAO Wn7LzMfHDnRawDrHwy0z3LLl4LM+l4O+WlqzykixVv6AQAiddWsEvz63U6m85Zf+Qg7y FR8pRucuN7uPkxUoBOktL45I3FUWGb7MhzC5MKIAA5zus9kD6xM7/SEsriaUhIgYV5gu ulxw== X-Gm-Message-State: AOAM530OXs41MfkMviN4yw9On3TQFb8OqrYOKUElJkhws57QFK2wgeBd XCpJktcUPsdg+rQinKgJd90n1hLP X-Google-Smtp-Source: ABdhPJxhlmJLRf2TF2kpW+fmWOdeKDHD6Tj6ESAdNPcfgqrPELV1Z1zH697XtoYCL+IrKAnXZHOWeg== X-Received: by 2002:adf:e411:: with SMTP id g17mr18097380wrm.77.1595886487296; Mon, 27 Jul 2020 14:48:07 -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.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jul 2020 14:48:06 -0700 (PDT) From: zimoun Date: Mon, 27 Jul 2020 23:47:54 +0200 Message-Id: <20200727214754.14297-3-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-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=S+eAK6CI; 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: 4.09 X-TUID: HWGPq6yHxqeO * guix/scripts/repl.scm: Use (guix scripts build) '%standard-build-options' to deal with 'load-path' option. --- guix/scripts/repl.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/guix/scripts/repl.scm b/guix/scripts/repl.scm index 0ea9c3655c..59edb543d1 100644 --- a/guix/scripts/repl.scm +++ b/guix/scripts/repl.scm @@ -21,6 +21,7 @@ (define-module (guix scripts repl) #:use-module (guix ui) #:use-module (guix scripts) + #:use-module ((guix scripts build) #:select (%standard-build-options)) #:use-module (guix repl) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) @@ -57,12 +58,9 @@ (option '(#\q) #f #f (lambda (opt name arg result) (alist-cons 'ignore-dot-guile? #t result))) - (option '(#\L "load-path") #t #f - (lambda (opt name arg result) - ;; XXX: Imperatively modify the search paths. - (set! %load-path (cons arg %load-path)) - (set! %load-compiled-path (cons arg %load-compiled-path)) - result)))) + (find (lambda (option) + (member "load-path" (option-names option))) + %standard-build-options))) (define (show-help) -- 2.26.2