From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 2GcVCkJwYmQstQAASxT56A (envelope-from ) for ; Mon, 15 May 2023 19:47:46 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id aIATCUJwYmS5mgAAG6o9tA (envelope-from ) for ; Mon, 15 May 2023 19:47:46 +0200 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 EC6383C89D for ; Mon, 15 May 2023 19:47:45 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pycHv-0006bm-VO; Mon, 15 May 2023 13:47:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pycHn-0006Xz-0w for guix-patches@gnu.org; Mon, 15 May 2023 13:47:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pycHm-0007Mj-OV for guix-patches@gnu.org; Mon, 15 May 2023 13:47:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pycHm-0006uJ-KG for guix-patches@gnu.org; Mon, 15 May 2023 13:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63522] [PATCH 2/2] scripts: import: elpa: Return consistent error code. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 May 2023 17:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63522 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63522@debbugs.gnu.org Cc: Simon Tournier Received: via spool by 63522-submit@debbugs.gnu.org id=B63522.168417276326434 (code B ref 63522); Mon, 15 May 2023 17:47:02 +0000 Received: (at 63522) by debbugs.gnu.org; 15 May 2023 17:46:03 +0000 Received: from localhost ([127.0.0.1]:44293 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pycGp-0006sG-7U for submit@debbugs.gnu.org; Mon, 15 May 2023 13:46:03 -0400 Received: from mail-wm1-f41.google.com ([209.85.128.41]:38223) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pycGl-0006r7-OG for 63522@debbugs.gnu.org; Mon, 15 May 2023 13:46:02 -0400 Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-3f42379d553so14815475e9.1 for <63522@debbugs.gnu.org>; Mon, 15 May 2023 10:45:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684172754; x=1686764754; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jODn2SMBz7cgdco0hlrJ//wHBpxlhFm2RM3eYAwGwKA=; b=PGxa5ZFN4cjte7RX1ytYZw+/oH/MiGeRpllwqJsAh0d+mMKfwkV/l7qbFa74NSgSXl Iul1pZadb1nE38m4ZAnqagYqt7jyG0pFwp9OGVVtwDg47ZpFIadFg2ASxVhOOp+4BEdC 2eOWaux2k5i3ei+G+dr6/HcRYWb1ZCG17rM+6Jw5ulqpn8xBN0pDcR4tl4DZu9UKcrvP ykOvm3tPYyXQ9TZel6Heh5FNMUXMeR6KyCIthRN9OycHX0Qm6t7RNyqcdo3AOmSxSHPP brbtlBNBQhr0QQEYVQUNt0egGmdR3Lng1tmL570dPkCtNseOCS05V7ql93nVyoEMTnK5 gUTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684172754; x=1686764754; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jODn2SMBz7cgdco0hlrJ//wHBpxlhFm2RM3eYAwGwKA=; b=T2cpatYoqFRKYcSH2kbXsSuWZ6i13tUGvBvEk5hJ7qBD9fubC2XMesKCVXaMfgPBwS GAHja4Ot10pU2pOW111Pcbl+qlzPsAwzN076imnnaDH9DvI7u1XPP1LE6ZDxADfx/DLW RuQZ8ScVDsS6DU/kTHdIEe8jGNKmYtXKlH6g75ULFJmBxb8s0TfoUUPHssxceDD7iGDq bChGU83STWUGr3yifmnuzkaixuXHWcqc2FVl/bz0TfWMwhBbBYNjOeZixRYnQ6lAnPiv KezPsQn2u/n+pZq/wkQrvvqflatMKU7vdAxROcChlKR8kgI2ptQG8FTmqHa4BmHwQ1gA UV4A== X-Gm-Message-State: AC+VfDyr+MRf83SqZ72eN2LYgxv63ffIivEdBxX0i5yOMormE0TcfcAK sna+pZ9MCXJr4Jw57/wahVbFhYdK4Z8= X-Google-Smtp-Source: ACHHUZ7qA72H8g0Sgoo4MXW0jbM0YAI06cpGILU2OeK9DPYMgiVAZOwvN6HsHHq2jwM2lr13pRPmdA== X-Received: by 2002:a05:600c:470c:b0:3f5:927:2b35 with SMTP id v12-20020a05600c470c00b003f509272b35mr3448703wmo.1.1684172753767; Mon, 15 May 2023 10:45:53 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id l9-20020a1c7909000000b003f4e3ed98ffsm74968wme.35.2023.05.15.10.45.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 May 2023 10:45:53 -0700 (PDT) From: Simon Tournier Date: Mon, 15 May 2023 19:45:45 +0200 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1684172866; a=rsa-sha256; cv=none; b=f5+mN0+2d3SraVrVyQz/47hEQqeMChF9hGxaYHEmpDWofQ4jCIBk4W7zdgQbeqzE/Jgtly 5wqT6pxjovaYQCiYCINqGYxcuYZ48MoVeMUmMZOrhaQjOd/UcENuTV+4Xgu3AInFnfp7Ky T2xOJQLI9ZxHvRI3zffXwG4X7Knz/I5qwxZwjLCCFtI1mNYXCYtFG06uvx2HJ0zPAVHVdx w9OBXIGpyGwUoOM6i7xxaZITJsr6Hx8okg3gy+nKOMTBRrAEkCedPOqZ3VAA2u09w/w/8Y UePxdaH4wjlwj5uXgYmib3NT73MgQes3nD6XJXJShA+2cbY5KPubz02U2HSxXQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=PGxa5ZFN; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1684172866; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=jODn2SMBz7cgdco0hlrJ//wHBpxlhFm2RM3eYAwGwKA=; b=pqUc6OMyO5DsdxDC2P6j9/Uo/L6ideo+l9r7RyH0UJe6sZoHX3lE4v/+M2OU95nOrH5j5n HnidKtkf7ZoLd9gSZShW0xlEvNO3XfgMpEihybU+XGhzRmSLLAKCE83tvV3/TLm+4wAtzN 86ZSNXe150i11E/9YRAsXrWuHGivT3Pr8vDGMUjus6XYJv+tfP5sXx5SK7BjMM1Q86NhZ3 F+TvTx+5OOUAKWerYMbMZ40U0X2mtPPzXQrg38gqBRod++6zKVZNhWjyW4FfD75NFOvtaB O9qViNQc7cgMfj+iRcsdN9kGNUAouIIvvLSba69U+Z0y4OtmnNrcVXuxsUH+aQ== X-Migadu-Spam-Score: -1.09 X-Spam-Score: -1.09 X-Migadu-Queue-Id: EC6383C89D X-Migadu-Scanner: scn0.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=PGxa5ZFN; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-TUID: BQu95eje22Ma Fixes . Reported by Ricardo Wurmus. * guix/scripts/import/elpa.scm (guix-import-elpa): Return consistent error code independently of the 'recursive' option. --- guix/scripts/import/elpa.scm | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/guix/scripts/import/elpa.scm b/guix/scripts/import/elpa.scm index a71478d3c8..f587eeb243 100644 --- a/guix/scripts/import/elpa.scm +++ b/guix/scripts/import/elpa.scm @@ -97,20 +97,21 @@ (define (guix-import-elpa . args) (package-name->name+version spec)) (when version (warning (G_ "this importer does not consider the version~%"))) - (if (assoc-ref opts 'recursive) - (with-error-handling - (map (match-lambda - ((and ('package ('name name) . rest) pkg) - `(define-public ,(string->symbol name) - ,pkg)) - (_ #f)) + (match (if (assoc-ref opts 'recursive) (elpa-recursive-import package-name - (or (assoc-ref opts 'repo) 'gnu)))) - (let ((sexp (elpa->guix-package package-name - #:repo (assoc-ref opts 'repo)))) - (unless sexp - (leave (G_ "failed to download package '~a'~%") package-name)) - sexp))) + (or (assoc-ref opts 'repo) 'gnu)) + (elpa->guix-package package-name + #:repo (assoc-ref opts 'repo))) + ((or #f '()) + (leave (G_ "failed to download meta-data for package '~a'~%") package-name)) + (('package etc ...) `(package ,etc)) + ((? list? sexps) (map + (match-lambda + ((and ('package ('name name) . rest) pkg) + `(define-public ,(string->symbol name) + ,pkg)) + (_ #f)) + sexps)))) (() (leave (G_ "too few arguments~%"))) ((many ...) -- 2.38.1