From patchwork Tue Jan 19 15:47:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 26495 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 2173427BC15; Tue, 19 Jan 2021 15:48:48 +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 CD06727BC14 for ; Tue, 19 Jan 2021 15:48:47 +0000 (GMT) Received: from localhost ([::1]:35930 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l1tFO-0008Ig-T1 for patchwork@mira.cbaines.net; Tue, 19 Jan 2021 10:48:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33748) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1tEi-0008E3-IF for guix-patches@gnu.org; Tue, 19 Jan 2021 10:48:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39815) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l1tEi-00070B-BD for guix-patches@gnu.org; Tue, 19 Jan 2021 10:48:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l1tEi-0004wg-A8 for guix-patches@gnu.org; Tue, 19 Jan 2021 10:48:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45984] [PATCH 5/5] scripts: import: gem: Fix recursive error handling. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Jan 2021 15:48:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45984 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45984@debbugs.gnu.org Received: via spool by 45984-submit@debbugs.gnu.org id=B45984.161107126118929 (code B ref 45984); Tue, 19 Jan 2021 15:48:04 +0000 Received: (at 45984) by debbugs.gnu.org; 19 Jan 2021 15:47:41 +0000 Received: from localhost ([127.0.0.1]:51356 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l1tEL-0004vA-7a for submit@debbugs.gnu.org; Tue, 19 Jan 2021 10:47:41 -0500 Received: from mail-wr1-f43.google.com ([209.85.221.43]:36717) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l1tEG-0004u5-1I for 45984@debbugs.gnu.org; Tue, 19 Jan 2021 10:47:36 -0500 Received: by mail-wr1-f43.google.com with SMTP id 6so12924863wri.3 for <45984@debbugs.gnu.org>; Tue, 19 Jan 2021 07:47:35 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=AZq9n9K3mhLGo69q8/aCWeQfa1D/MIPb9a+XYJWSpBE=; b=QGX0xSMbU3SVPc5VVadiwYBx8aw9hVDgLIMJ++6i+BSsMeGeZ48RxMszpu2nz9gUV0 eazwED8JDl4C+18+etr6J04XubgS8XHHfdIRxJnSpFdngX1t+XCUDsf/RiEYGetbNht6 LEf2Y5jLFcFxw7ZJwU4Sz4vu+QwrMBN5vYfH4UjxuBhEloI07SWoaveowFaDx+DtvMmq xZWDvhfxx/rRI8h1i+AZalmkYFIklp/zzJ5aGDTKel+lpT1X39oHUJKHhkOwYpSHVrC6 aBC8sD4AejNTnUwtVGRKKwQHPMnE8Hwk5jTGn+tFa18m12lQUqGAjp6c2jYfnKnHfElW QVIg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=AZq9n9K3mhLGo69q8/aCWeQfa1D/MIPb9a+XYJWSpBE=; b=Ntqb9bBhtm8IzraDUz/4hAFSMRnu6eD0vY3yaB6EFl0unLTUzo2aXLYZPPTy+biB3A Z0tMqfmZBa83/Wm1Q4whrfRuxh3sALivWotXj4r42uM10h0aeqGLyL0Z0P9Bh0iprI51 m3qOBqBt7oLkPwEcjjAj8qqAHPE7paSZKeE/dwSUQRz7YH7JibD6/3oUIzgj2nAVPWYm o+cucnZyDooyexLGZXB3Qoaf0A+y7W4KhAvCaYdJ+WZKJe/FbM5ON6oyDJvOxo1D+dh5 QwbYRrZFGfhIRUPnb5oDbPWQmZoD0O/C6qmCk7IEKUDo0H+vm2KXBxKFXfN3oeKowfFd gCaQ== X-Gm-Message-State: AOAM531rj1hZ70zyUEqWCdwOl8TQIdCMAK+KnXlOV8LteTWZjw8syaMr BXnen3BgvAjU4sdFqeXJYmuZuANPOKM= X-Google-Smtp-Source: ABdhPJycwiiNP3yhu2zEe38FOZH+FYlMJ5oGYccqkJHC2OrxT1W/1gZ0Vbl+xWz0y/ZrCCjQ28CTTw== X-Received: by 2002:adf:dc8b:: with SMTP id r11mr5096789wrj.131.1611071250216; Tue, 19 Jan 2021 07:47:30 -0800 (PST) Received: from lili.univ-paris-diderot.fr ([88.126.110.68]) by smtp.gmail.com with ESMTPSA id o14sm34279778wri.48.2021.01.19.07.47.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jan 2021 07:47:29 -0800 (PST) From: zimoun Date: Tue, 19 Jan 2021 16:47:21 +0100 Message-Id: <20210119154721.11999-5-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210119154721.11999-1-zimon.toutoune@gmail.com> References: <20210119154721.11999-1-zimon.toutoune@gmail.com> 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 partially . * guix/scripts/import/gem.scm (guix-import-gem): Handle error. --- guix/scripts/import/gem.scm | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/guix/scripts/import/gem.scm b/guix/scripts/import/gem.scm index c64596b514..99a2955e4c 100644 --- a/guix/scripts/import/gem.scm +++ b/guix/scripts/import/gem.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 David Thompson ;;; Copyright © 2018 Oleg Pykhalov +;;; Copyright © 2021 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -88,18 +89,20 @@ Import and convert the RubyGems package for PACKAGE-NAME.\n")) (reverse opts)))) (match args ((package-name) - (if (assoc-ref opts 'recursive) - (map (match-lambda - ((and ('package ('name name) . rest) pkg) - `(define-public ,(string->symbol name) - ,pkg)) - (_ #f)) - (gem-recursive-import package-name 'rubygems)) - (let ((sexp (gem->guix-package package-name))) - (unless sexp - (leave (G_ "failed to download meta-data for package '~a'~%") - package-name)) - sexp))) + (let ((code (if (assoc-ref opts 'recursive) + (map (match-lambda + ((and ('package ('name name) . rest) pkg) + `(define-public ,(string->symbol name) + ,pkg)) + (_ #f)) + (gem-recursive-import package-name 'rubygems)) + (let ((sexp (gem->guix-package package-name))) + (if sexp sexp #f))))) + (match code + ((or #f '(#f)) + (leave (G_ "failed to download meta-data for package '~a'~%") + package-name)) + (_ code)))) (() (leave (G_ "too few arguments~%"))) ((many ...)