From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id qOskC2x4A2EFnAAAgWs5BA (envelope-from ) for ; Fri, 30 Jul 2021 05:56:28 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id IJXfBmx4A2E2KwAA1q6Kng (envelope-from ) for ; Fri, 30 Jul 2021 03:56:28 +0000 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 9F3D08D22 for ; Fri, 30 Jul 2021 05:56:27 +0200 (CEST) Received: from localhost ([::1]:43550 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m9JdK-0007Vx-Ot for larch@yhetil.org; Thu, 29 Jul 2021 23:56:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59452) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m9Jcx-0006pE-OD for guix-patches@gnu.org; Thu, 29 Jul 2021 23:56:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47152) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m9Jcx-0006BP-Fn for guix-patches@gnu.org; Thu, 29 Jul 2021 23:56:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m9Jcx-0003vO-Fi for guix-patches@gnu.org; Thu, 29 Jul 2021 23:56:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49780] [PATCH 06/14] import: cran: Use PARSE-COMMAND-LINE for options. Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 30 Jul 2021 03:56:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49780 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49780@debbugs.gnu.org Received: via spool by 49780-submit@debbugs.gnu.org id=B49780.162761733214927 (code B ref 49780); Fri, 30 Jul 2021 03:56:03 +0000 Received: (at 49780) by debbugs.gnu.org; 30 Jul 2021 03:55:32 +0000 Received: from localhost ([127.0.0.1]:58671 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m9JcR-0003sa-FV for submit@debbugs.gnu.org; Thu, 29 Jul 2021 23:55:31 -0400 Received: from out0.migadu.com ([94.23.1.103]:28441) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m9JcK-0003rv-Ui for 49780@debbugs.gnu.org; Thu, 29 Jul 2021 23:55:26 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1627617324; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=81ao+knwzwVZ3AmCy8Ec6zpX3jJLJcCLa7mKZRt2I7I=; b=XjGYaaZ0mCpec6hZ1nIVGhU8/cKtW1R+5aIp6MV0mGkmqvIq4rcgAFE+870R3ZzQuBiu3g liDs/Iy5MFMPsNGI+RgHOrZ8YOcnCctz3ILEUweOauCLaWSOlCVsmLqVtz/Jje3Xqzn3rH wcyW7t8VyzyMi6xFjNiWfEefdX+7PD4= From: Sarah Morgensen Date: Thu, 29 Jul 2021 20:55:02 -0700 Message-Id: <4600ae9cdab23bc81790a9a2098d813ea2941205.1627617006.git.iskarian@mgsn.dev> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Migadu-Auth-User: iskarian@mgsn.dev 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" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1627617387; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: 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=81ao+knwzwVZ3AmCy8Ec6zpX3jJLJcCLa7mKZRt2I7I=; b=E3nbCfKflYBBNMzB1nP2ApNi86OOmV8KlC7NvN2lte5OUou9c+EWpAjmvbgvxEjpGzZqXL 7aDMJ4JGTbdJrqVpjD6tV/1fJ0znlzq208Ck3TNJ/tiG+qXw9CMrTn/OWjP8FL9Pgt/j/+ RAf8IlAHCGfcDjyL7bFc8l86jWxBoGUxzdEzA2yFYH2882psh+awYYfMuzxVVRX+IxTndl oqDMgCbeaFCZ2WaLgVqBNnIf59eepHpTXcKhVaWA1lG5KaaLDYZkBsddb2TLqNKWct1SCC phOmvNAIDFdwhUTWvXN2kcNxk2PjjtNvGb+6jBGLp0uoXqWVuu/nWx2/Y7WZVA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1627617387; a=rsa-sha256; cv=none; b=Pkb8/HpXMhDg13GybvHCbxG85Ld9n+SEjmbH0ikcQNYYq2EXZkVANJtELZZsVK8IY+iZdZ 0xtRqYYaehWWm8F2PMVe/MjKisFS8u184CtS1DoD5/+prqd2VkvM5jvLhLmivFEzw/8Nk/ k7x6XALCX4omP531UofsYZjmGJi0zXyH2zGa4q5NTnWGH24BLi+niBvGJuMCcNvTQZE8L4 VoSIT/W+SqtrJvGqt1DE2iraGgiOFhJha1zbZR45e+fHFK09P41KV8ZlxO0TEmTd+anvYu N8gt5XP1O11S9KILMcsbYdtwXPBDnOxb8RHc+gi8rL1gbrhxyF6Bt4jzu1mG2w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=XjGYaaZ0; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -0.31 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=XjGYaaZ0; dmarc=fail reason="SPF not aligned (relaxed)" header.from=mgsn.dev (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 9F3D08D22 X-Spam-Score: -0.31 X-Migadu-Scanner: scn0.migadu.com X-TUID: QgF5mapnLjSo guix/scripts/import/cran.scm (guix-import-cran)[parse-options]: Use PARSE-COMMAND-LINE instead of ARGS-FOLD*. --- guix/scripts/import/cran.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/guix/scripts/import/cran.scm b/guix/scripts/import/cran.scm index aa3ef324e0..3e4b038cc4 100644 --- a/guix/scripts/import/cran.scm +++ b/guix/scripts/import/cran.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2015, 2017, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2020 Martin Becze +;;; Copyright © 2021 Sarah Morgensen ;;; ;;; This file is part of GNU Guix. ;;; @@ -86,12 +87,8 @@ Import and convert the CRAN package for PACKAGE-NAME.\n")) (define (guix-import-cran . args) (define (parse-options) ;; Return the alist of option values. - (args-fold* args %options - (lambda (opt name arg result) - (leave (G_ "~A: unrecognized option~%") name)) - (lambda (arg result) - (alist-cons 'argument arg result)) - %default-options)) + (parse-command-line args %options (list %default-options) + #:build-options? #f)) (let* ((opts (parse-options)) (args (filter-map (match-lambda -- 2.31.1