From patchwork Mon May 15 17:44:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 1498 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 E85EB27BBEA; Mon, 15 May 2023 18:45:18 +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 D288F27BBE9 for ; Mon, 15 May 2023 18:45:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pycFx-0006Hn-4k; Mon, 15 May 2023 13:45:09 -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 1pycFt-0006He-F8 for guix-patches@gnu.org; Mon, 15 May 2023 13:45:06 -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 1pycFq-0006X8-RT for guix-patches@gnu.org; Mon, 15 May 2023 13:45:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pycFq-0006pZ-9V; Mon, 15 May 2023 13:45:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63522] [PATCH 0/2] Fix return code of "guix import elpa" Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: rekado@elephly.net, guix-patches@gnu.org Resent-Date: Mon, 15 May 2023 17:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63522 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63522@debbugs.gnu.org Cc: Simon Tournier , rekado@elephly.net X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: rekado@elephly.net Received: via spool by submit@debbugs.gnu.org id=B.168417266826195 (code B ref -1); Mon, 15 May 2023 17:45:02 +0000 Received: (at submit) by debbugs.gnu.org; 15 May 2023 17:44:28 +0000 Received: from localhost ([127.0.0.1]:44284 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pycFI-0006oR-5J for submit@debbugs.gnu.org; Mon, 15 May 2023 13:44:28 -0400 Received: from lists.gnu.org ([209.51.188.17]:39850) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pycFE-0006oH-Kw for submit@debbugs.gnu.org; Mon, 15 May 2023 13:44:26 -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 1pycF5-0006De-RR for guix-patches@gnu.org; Mon, 15 May 2023 13:44:19 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pycF4-0006N0-9O for guix-patches@gnu.org; Mon, 15 May 2023 13:44:15 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-30627f40e65so1983555f8f.0 for ; Mon, 15 May 2023 10:44:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684172652; x=1686764652; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=bLPL6W/EZRvRviEPukApADj6yJYKl9wzCPEAU6CLSxA=; b=Nj7Iqk5RAS1cZo5VvCJvBZH5MB1fmaudLxgKDuW/9vypzXVUAKF0Nl3P9mPBRdGI6a h1qnxUxjy+o99Auq+2wW4YPHLQVV2/+E9hlETDrF1GWby1INCXsZOpBRWOGSIiT0B6ph I9z/hsSmcLB60jy3dlM4hTOHGBYg0kJM987lgMm9dp9RG18VQj9Czp871Gs4CbkB/jC1 Tp7LGDMrqgNs4WmUt5Uaoxitxd4YCK26fl8QGYLN50HRQwu/nYsmko5nk14J/QowjZmW 9U8g7AMnMx5wBwwqXWdpU/yNEblIQGT6yBcG55qHw6pwJyOaQpGQgTyshZbZQOKgHxLm GcHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684172652; x=1686764652; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=bLPL6W/EZRvRviEPukApADj6yJYKl9wzCPEAU6CLSxA=; b=JE81+qAuYeqa7NnwEGif4DRQVwtj3QD/K6aYhnrDdoDNjU/pqw2URM8c3AznJa/Bes LuN5pUl8w9nqDJpK6wJ5haEL3bvACaOZsdTeJHt9+bMYVQBVX37hPUq2lZP7VIhHHt52 gTA+DmGeBNvUDJNKszsPUPoEbfGQvBUfqvyDcPPWuJLJiYfyfLVYNilE4ukQUt0d3E0i uOMQXSWKBfuwxzHMkVUrBCxBwEauiB7Tfb3BLVzHbfLZPJM3DKxaGtZhLUgRUv5AjuJi aiquOTR6HGN6xGsbPcqMzP2eGmSJZ8QVHNVCrgWvmtfPnkL7itMQ00SoLp2T7JSolR3f ejIw== X-Gm-Message-State: AC+VfDybWEjkCsJz2G9lZ/4LCiC38typY88Ut0p+LAwXpMcSQCGdmvBB xDwGauzYuGv96yKNbhVgdaIoaz5dW3I= X-Google-Smtp-Source: ACHHUZ7RofT1Y2B4ybdCLRNph3OulU0vSox7f9KIwB8Fj9/ToxkgKcx3olKPTiK41WHqGCdtLH0agg== X-Received: by 2002:a05:600c:82c7:b0:3f4:24fa:ca1c with SMTP id eo7-20020a05600c82c700b003f424faca1cmr6529706wmb.0.1684172651858; Mon, 15 May 2023 10:44:11 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id w10-20020a5d544a000000b003079f2c2de7sm361612wrv.112.2023.05.15.10.44.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 May 2023 10:44:11 -0700 (PDT) From: Simon Tournier Date: Mon, 15 May 2023 19:44:04 +0200 Message-Id: X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=zimon.toutoune@gmail.com; helo=mail-wr1-x42a.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, T_SCC_BODY_TEXT_LINE=-0.01 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Hi, This fixes issue #58308 [1]: --8<---------------cut here---------------start------------->8--- $ ./pre-inst-env guix import elpa syslog guix import: error: failed to download meta-data for package 'syslog' $ echo $? 1 $ ./pre-inst-env guix import elpa syslog -r guix import: error: failed to download meta-data for package 'syslog' $ echo $? 1 --8<---------------cut here---------------end--------------->8--- In addition, since Elpa importer does not support the specification of the version, the first patch warns about that: --8<---------------cut here---------------start------------->8--- $ ./pre-inst-env guix import elpa -a melpa magit@12 guix import: warning: this importer does not consider the version (package ((name "emacs-magit") (version "20230510.2139") [...] --8<---------------cut here---------------end--------------->8--- 1: https://issues.guix.gnu.org/issue/58308 Cheers, simon Simon Tournier (2): scripts: import: elpa: Warn when version is specified. scripts: import: elpa: Return consistent error code. guix/scripts/import/elpa.scm | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) base-commit: 6e38ec447f98383e0722ac300734f8d7c8c5c7b0