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 QAHVByM6AmD+eAAA0tVLHw (envelope-from ) for ; Sat, 16 Jan 2021 00:58:11 +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 KCCqAyM6AmDqJAAA1q6Kng (envelope-from ) for ; Sat, 16 Jan 2021 00:58:11 +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 893E99403AA for ; Sat, 16 Jan 2021 00:58:10 +0000 (UTC) Received: from localhost ([::1]:34978 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l0Zur-0000ap-AD for larch@yhetil.org; Fri, 15 Jan 2021 19:58:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46644) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0Zuk-0000aV-Iz for guix-patches@gnu.org; Fri, 15 Jan 2021 19:58:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58701) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l0Zuk-0005jZ-BM for guix-patches@gnu.org; Fri, 15 Jan 2021 19:58:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l0Zuk-0005qH-9h for guix-patches@gnu.org; Fri, 15 Jan 2021 19:58:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45910] [PATCH] ui: Switch precedence for extensions. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Jan 2021 00:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 45910 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45910@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.161075864122396 (code B ref -1); Sat, 16 Jan 2021 00:58:02 +0000 Received: (at submit) by debbugs.gnu.org; 16 Jan 2021 00:57:21 +0000 Received: from localhost ([127.0.0.1]:42014 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l0Zu5-0005pA-1r for submit@debbugs.gnu.org; Fri, 15 Jan 2021 19:57:21 -0500 Received: from lists.gnu.org ([209.51.188.17]:57358) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l0Zu0-0005ox-Vg for submit@debbugs.gnu.org; Fri, 15 Jan 2021 19:57:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46542) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0Zu0-0000XM-Ma for guix-patches@gnu.org; Fri, 15 Jan 2021 19:57:16 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:32829) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l0Zty-0005R9-20 for guix-patches@gnu.org; Fri, 15 Jan 2021 19:57:16 -0500 Received: by mail-wm1-x332.google.com with SMTP id s24so1864726wmj.0 for ; Fri, 15 Jan 2021 16:57:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=LofPuVh7S+wZw4B/MUPWNDmVlGVnCJV1xiPhpdn3+zg=; b=WxLaLZjZgp5ur6TzqJbX34Sh9z1hKQJSCOBzuHSthJ3BeWE9XofRPQuSWtsPYxvpCj rEfa1M/10FfRhglUjupyLtfudRFLIs8cQWwVupAB0h4Sr33psnEVeHWt0oMOSKSDl5kh /fTPc9ePLZJ9jwRJe58aNjfvWkVscYZEMVJBpfNAu/YUWcHVZzHOfMiZ7CWm095aZ5Yn lEf+aqUhv61l88fSKb7JHgWRf6gMv+W1vREUyY8LpxmcJJ0BBEE6CF/fB5dxoOlwdlTD 6U39ZNppsLQhkiFKLl1XJTvnzM9oML83mJMh0s+cmHrhoHV77le9UyW0oAr5E1PHkzxh Ycew== 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:mime-version :content-transfer-encoding; bh=LofPuVh7S+wZw4B/MUPWNDmVlGVnCJV1xiPhpdn3+zg=; b=D0JhKl71eeokLOF3s+LW4VwTpl1yFKVBCVpnkzwRTCbOe1YWmxwLEwrg0pVrBmaWag AShOhzTXPlWhevbQrLw/EWsQEIQmb9JaGiAmfTL08cDALdaLals6dV3AAvl9ntIWmLQ6 9SM2R3Zygi2+9cn1TO6PX58LsvrvQegVArQIFDUl3ZGWJG84S/Kv4wbEXRILmSVd240d lptVL6/dMBHa/HQoBLgmKxLc2I3MH5DIEAhwGdyBgvlVBONC/iiZAVndf0O7wfXEXMhm SnDF4zDJOQPGr6WoxRJSHzeHny+qZG+ng6AZ0X9gSgeCvGWiBzkJP/hqNs9KD/9jzIof 4+7w== X-Gm-Message-State: AOAM531nMoL5ITkQuCj07XdV4RsUN4zDtCyLRFHgE3LF4Jkoq2fKwk8D k/G1gyWXbies2Kf4QSZLEW1SnJHHmCw= X-Google-Smtp-Source: ABdhPJwdxn4lbSkaU7Dp4rOX0hB48mCYeyACT+cB+SbCfhmriVCV6agAdzWplmbvjHBLjl9Ua4kqJQ== X-Received: by 2002:a1c:b1d7:: with SMTP id a206mr10871463wmf.88.1610758632431; Fri, 15 Jan 2021 16:57:12 -0800 (PST) Received: from lili.univ-paris-diderot.fr ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id y63sm14800262wmd.21.2021.01.15.16.57.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jan 2021 16:57:11 -0800 (PST) From: zimoun Date: Sat, 16 Jan 2021 01:57:08 +0100 Message-Id: <20210116005708.22610-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=zimon.toutoune@gmail.com; helo=mail-wm1-x332.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 2.74 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=WxLaLZjZ; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); 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: 893E99403AA X-Spam-Score: 2.74 X-Migadu-Scanner: scn1.migadu.com X-TUID: YEmngrLB0VTJ * guix/ui.scm (run-guix-command): Modify order that extensions are allowed to override default commands. --- guix/ui.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/guix/ui.scm b/guix/ui.scm index bd504c68da..ad78d5cedd 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -2126,18 +2126,18 @@ found." (define module (catch 'misc-error (lambda () - (resolve-interface `(guix scripts ,command))) - (lambda _ ;; Check if there is a matching extension. + (match (search-path (extension-directories) + (format #f "~a.scm" command)) + (#f + (throw 'misc-error)) + (file + (load file) + (resolve-interface `(guix extensions ,command))))) + (lambda _ (catch 'misc-error (lambda () - (match (search-path (extension-directories) - (format #f "~a.scm" command)) - (#f - (throw 'misc-error)) - (file - (load file) - (resolve-interface `(guix extensions ,command))))) + (resolve-interface `(guix scripts ,command))) (lambda _ (format (current-error-port) (G_ "guix: ~a: command not found~%") command) base-commit: 884f320e7ceb35cb8472510e47fc5f1944675d82 -- 2.29.2