From patchwork Mon May 15 17:45:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 50024 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 6659327BBE9; Mon, 15 May 2023 18:47:47 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BEB5127BBE2 for ; Mon, 15 May 2023 18:47:45 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pycI1-0006dP-Du; Mon, 15 May 2023 13:47:17 -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 1pycHm-0006Xs-Jo for guix-patches@gnu.org; Mon, 15 May 2023 13:47:02 -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-0007Ma-BZ 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-0006uC-7W for guix-patches@gnu.org; Mon, 15 May 2023 13:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63522] [PATCH 1/2] scripts: import: elpa: Warn when version is specified. 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.168417276226392 (code B ref 63522); Mon, 15 May 2023 17:47:02 +0000 Received: (at 63522) by debbugs.gnu.org; 15 May 2023 17:46:02 +0000 Received: from localhost ([127.0.0.1]:44291 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pycGn-0006rT-N7 for submit@debbugs.gnu.org; Mon, 15 May 2023 13:46:02 -0400 Received: from mail-wm1-f43.google.com ([209.85.128.43]:40366) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pycGl-0006r5-8y for 63522@debbugs.gnu.org; Mon, 15 May 2023 13:45:59 -0400 Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-3f4291ab0d1so13879455e9.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=1684172753; x=1686764753; 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=mdxFSig7HZCwT/OWsf+t3dm/cWrSzYnnjGrPIIGzGs8=; b=R6Anj4TTU64htYv6md0F/YJphfWTXue1xeZKcNfsL78PGerw3G/dEm3UYg3krLytLM myO1AVasob04DKq/1YX/DxD2qtUVcbuLut4As3nDplSJj7AhqX2LdQuljAL8OxyxEdtN 5tSUNWwUBIJ5WpG0WOMy1dINFu5Mf1AsCHqPG8htcdYq0mymVtw7pgLDLzsqf8vAaxWC SriKECZOCSGc0qpWqHkLOXbcpQWziM1pLR9SMIeH9lvMGNyHysMIbz7FdXiXioLyqSzu DFcqwIeROvklQBwCQ0lVfXqnCgOTBKVCJPTW0Z1kjYzqfCPY2KruOpSlI4VH5JzZRXfL BEVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684172753; x=1686764753; 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=mdxFSig7HZCwT/OWsf+t3dm/cWrSzYnnjGrPIIGzGs8=; b=IJp/4bDbIz82owOs2FV/acU53cUcNYUqUgLU2eXAvAeUd281vfwPFmN1x0ihw72EPP mZijBN5e4Z3bUHD4jLt/yDQRSBAenk8fzDGGd4/4EykPWooiNKz8YCm1CDHnvsDlF9h5 Zd/oehLKbQzkGtGf3w/3lYUelab1uzd57iPDPeU9B6ZKk/yS01pd4GcQklqudhcQYhEg sXs4C96bXH7JsUOJfQjW3M/umPBB72izhM42RifSWNi9lg4wbVyqTimWcMQgI7EWHsIw 8NzjsWRxmedk0TSP8cJrKqJ1wsGYgn+6J6DeqTWksDH4CWINq2v/VtqVkj0IDrEKnn7k qLQw== X-Gm-Message-State: AC+VfDy9yFj03JJOvfdH+Ftver65k6Bd8IhdaUCkCQlJJ17yP/XIE/xL e3TClIlOPNOuu0cPj4rZ09SLU97D3B0= X-Google-Smtp-Source: ACHHUZ4rnVNRqsi7GL6YHv+iDPowW+HHkaZ9V6AQqhO6/nNQPB3e5p8PoWJvRN1UdeTZCiMAdZ/72A== X-Received: by 2002:a05:600c:c10:b0:3f0:a845:f215 with SMTP id fm16-20020a05600c0c1000b003f0a845f215mr129637wmb.3.1684172753380; 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:44 +0200 Message-Id: <86cc82e9e87b1591de67d4c808c80345df7cbcb8.1684171669.git.zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/scripts/import/elpa.scm (guix-import-elpa): Warn when version is specified. --- guix/scripts/import/elpa.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/guix/scripts/import/elpa.scm b/guix/scripts/import/elpa.scm index 052b0cc0e7..a71478d3c8 100644 --- a/guix/scripts/import/elpa.scm +++ b/guix/scripts/import/elpa.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2018 Oleg Pykhalov ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2021 Sarah Morgensen +;;; Copyright © 2023 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -91,7 +92,11 @@ (define (guix-import-elpa . args) (_ #f)) (reverse opts)))) (match args - ((package-name) + ((spec) + (define-values (package-name version) + (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 From patchwork Mon May 15 17:45:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 50023 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 EF13627BBE9; Mon, 15 May 2023 18:47:46 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 091BC27BBEA for ; Mon, 15 May 2023 18:47:46 +0100 (BST) 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 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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 ...)