From patchwork Thu Jan 7 14:15:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 26260 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0F04627BC0E; Thu, 7 Jan 2021 14:16:26 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B713727BC0D for ; Thu, 7 Jan 2021 14:16:25 +0000 (GMT) Received: from localhost ([::1]:51806 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kxW5Q-00086p-UY for patchwork@mira.cbaines.net; Thu, 07 Jan 2021 09:16:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48118) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kxW55-000849-TM for guix-patches@gnu.org; Thu, 07 Jan 2021 09:16:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35352) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kxW54-0005tU-DU for guix-patches@gnu.org; Thu, 07 Jan 2021 09:16:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kxW54-0005pq-9J for guix-patches@gnu.org; Thu, 07 Jan 2021 09:16:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45714] [PATCH 1/1] ui: Fix extensions. References: <20210107141236.32694-1-zimon.toutoune@gmail.com> In-Reply-To: <20210107141236.32694-1-zimon.toutoune@gmail.com> Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 07 Jan 2021 14:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45714 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45714@debbugs.gnu.org Received: via spool by 45714-submit@debbugs.gnu.org id=B45714.161002891922362 (code B ref 45714); Thu, 07 Jan 2021 14:16:02 +0000 Received: (at 45714) by debbugs.gnu.org; 7 Jan 2021 14:15:19 +0000 Received: from localhost ([127.0.0.1]:46898 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kxW4N-0005oc-53 for submit@debbugs.gnu.org; Thu, 07 Jan 2021 09:15:19 -0500 Received: from mail-wm1-f48.google.com ([209.85.128.48]:33127) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kxW4L-0005oL-Aj for 45714@debbugs.gnu.org; Thu, 07 Jan 2021 09:15:17 -0500 Received: by mail-wm1-f48.google.com with SMTP id n16so5000129wmc.0 for <45714@debbugs.gnu.org>; Thu, 07 Jan 2021 06:15:17 -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=PF8XTvg6tDasg01lcgqZrE0T8Ycf9DBBMHn5yLZ5UTo=; b=fv3tjlOArYMWiGYKHDBvui3Vl36WaN/psWGiVbnmU+s6+tqy0HiypHaHbI1hK6H7vt eqAfQ2E+cI6fYdgXR//O9OCWg7dONkdxzRqAMPvpaojvc8zBVpMKTfmDQDhtXhl4RvZc IASH+q5mLGTMXVqNqKSLuWau6wDKz7E9ZxjkFnZ1NMcqYS3VGvqfd8AgR0ht0XIg64rw EELj/+6fx3+OVoMJ9xQdM2Jd4XbSKRCFtEAoK7qogiftwBEVb/lBLmUSuFLY0oLT5Kg2 eddFn8lLviKhluVVP3biRcraaL/VXxGXwZi+gfXElW9fKtRD205ANOd96tc5jJY0Cp9w tWfw== 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=PF8XTvg6tDasg01lcgqZrE0T8Ycf9DBBMHn5yLZ5UTo=; b=lzBDwg9JFknSym4Bs9mO8BF/dihcAeI3LkfnthbkwbTAKzZWJ85cx4qKeeRdWiEzC3 axZ5H5RarHkDqncjpvmAyIImpbB5VtpzIxdW3eOMUiuAgvcly+sZJmfdgREHzpt4NcBA uOFmPecPLtBCGCfNgwzLZyKov4O97XYxJQ8LUh6/rGRlNyRbMfosMrl6v5BqMMyHDqR3 TWRLuPtztyIea7V6Ary4MPg+Qhg+NE/mUXAWBovG6U6KzZFXjTP9g7gZ+AR+N2+axhVS va0eYdJfQ0jmJNCkk+Fn0xW2b5LasGvT10ms/CEtBzp0A6I50rOOCTG6f9/xuT3kKi3p N3MA== X-Gm-Message-State: AOAM533yg0DkV7RjieXOiyhZPI2m8FV0/CglQC6iwSs1/A1i7J1Fk4VA BQ88zrssKCUsRwMwLdreStZgUkw2hLI= X-Google-Smtp-Source: ABdhPJziBhiRgo7+kfw1X5epoNE5lzXI7zuArSg5yNSd9c2gZKA3u/FqwTjs/Col8HizD7TiBbN1uA== X-Received: by 2002:a1c:6208:: with SMTP id w8mr8226499wmb.96.1610028911499; Thu, 07 Jan 2021 06:15:11 -0800 (PST) Received: from localhost.localdomain ([193.48.40.110]) by smtp.gmail.com with ESMTPSA id d191sm7807688wmd.24.2021.01.07.06.15.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jan 2021 06:15:11 -0800 (PST) From: zimoun Date: Thu, 7 Jan 2021 15:15:03 +0100 Message-Id: <20210107141503.32751-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Fixes . * guix/ui.scm: (run-guix-command): Fix. --- guix/ui.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/guix/ui.scm b/guix/ui.scm index 7f52518023..bd504c68da 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019 Chris Marusich ;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice -;;; Copyright © 2019 Simon Tournier +;;; Copyright © 2019, 2021 Simon Tournier ;;; Copyright © 2020 Arun Isaac ;;; Copyright © 2020 Maxim Cournoyer ;;; @@ -2133,11 +2133,11 @@ found." (lambda () (match (search-path (extension-directories) (format #f "~a.scm" command)) + (#f + (throw 'misc-error)) (file - (load file) - (resolve-interface `(guix extensions ,command))) - (_ - (throw 'misc-error)))) + (load file) + (resolve-interface `(guix extensions ,command))))) (lambda _ (format (current-error-port) (G_ "guix: ~a: command not found~%") command)