From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id kPT2FXV4A2EFnAAAgWs5BA (envelope-from ) for ; Fri, 30 Jul 2021 05:56:37 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id aAydEXV4A2HFcgAAB5/wlQ (envelope-from ) for ; Fri, 30 Jul 2021 03:56:37 +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 08F9E5718 for ; Fri, 30 Jul 2021 05:56:37 +0200 (CEST) Received: from localhost ([::1]:44392 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m9JdU-00088k-1g for larch@yhetil.org; Thu, 29 Jul 2021 23:56:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59462) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m9Jcy-0006sL-I5 for guix-patches@gnu.org; Thu, 29 Jul 2021 23:56:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47154) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m9Jcy-0006D5-8E for guix-patches@gnu.org; Thu, 29 Jul 2021 23:56:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m9Jcy-0003vd-7T for guix-patches@gnu.org; Thu, 29 Jul 2021 23:56:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49780] [PATCH 08/14] import: json: 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:04 +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.162761733214941 (code B ref 49780); Fri, 30 Jul 2021 03:56:04 +0000 Received: (at 49780) by debbugs.gnu.org; 30 Jul 2021 03:55:32 +0000 Received: from localhost ([127.0.0.1]:58676 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m9JcS-0003sq-CY for submit@debbugs.gnu.org; Thu, 29 Jul 2021 23:55:32 -0400 Received: from out0.migadu.com ([94.23.1.103]:28465) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m9JcP-0003sR-6a for 49780@debbugs.gnu.org; Thu, 29 Jul 2021 23:55:29 -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=1627617328; 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=92z/ICd7Zm8rRGVS1N97oEsSx/CL2+wMuI1BnTIV7Os=; b=IX7if4DeFHcxlzu6BxYPhAzACQCV00/a1iw1ppPFkwvSqWBKU8+9NI5K5nrskeI8UUeon8 bugItKADM9d/ceDip9P4/nDNVgFZAPiGvp0Hm2+q2+GsUhIP4GZelAoKU7pHDfGojoDodC gphOVqZWr9TAFe0QD+PZnR3UgP6aeMc= From: Sarah Morgensen Date: Thu, 29 Jul 2021 20:55:04 -0700 Message-Id: <0136e6efdb033fc2bdf8bd0c4a0a9d64eb742115.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=1627617397; 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=92z/ICd7Zm8rRGVS1N97oEsSx/CL2+wMuI1BnTIV7Os=; b=arR6mlkRY8vIw69b40KYc9NHHoAuM8wMNW8ZQgHYffv0KegD8QJ2FL8H66Ad7F98LF94Wc KfQJYV1R+jxQh9dcohJcwdOHwhj5MBtMnwppcWgsMmWmTQAYGM/ekPvcnDz5r9SzDCCr6A GfkPhJH/D1iTK3ygNkuJ+u7ioiWPtBMX7yMLt7DUtmsIdwykB+OuxP+udPWJI3IORqwZ0G hbOT4O4bW3xoIU5osinMCxT1PWN5aIprKL3TitmL/h7DFcjgPue62H89hhYGgF6OqI7BO4 uEB+fnbJ0lMrcJsFZcvNxBz4QZGHFJMIZ3GCIVvAq7ZLGGExpDTs52+PfPClQA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1627617397; a=rsa-sha256; cv=none; b=mXd9WtTsOljZ2KpcTE6npSFeZ/98jKJyTDA9pBQQVFPIQUX2+iJOO0K8EZJGXsDnAQy0RC 4zDVMGH9hcI/yfOnroMh1x40UBcb8WVaLbv071ejbH/wu4wpPHqiIajc1rq+nyUFT0pwgX rqw2sd++eYDo9J7Q2SevRiVznomrqWpARpIvyU0MQRcv45t0z6+QFBoG3z8vOnzJ1JIX5+ jwT7npv6897V+VZ/Mqe8Z45Lqs16604RjaK6ieSSyNEP8UZnZ3SHK+72PLFdb1o3VlmTLF W6A3j8z9XbdqGknTyKVuScHlGCAAyBP9RuuTaWRW7doVuNE4uaPFYbikl1MdXw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=IX7if4De; 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-Spam-Score: -0.31 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=IX7if4De; 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: 08F9E5718 X-Spam-Score: -0.31 X-Migadu-Scanner: scn0.migadu.com X-TUID: AHGSwaVnM9/M guix/scripts/import/json.scm (guix-import-json)[parse-options]: Use PARSE-COMMAND-LINE instead of ARGS-FOLD*. --- guix/scripts/import/json.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/guix/scripts/import/json.scm b/guix/scripts/import/json.scm index d8d5c3a4af..a3b5e6d79c 100644 --- a/guix/scripts/import/json.scm +++ b/guix/scripts/import/json.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2015, 2017 Ricardo Wurmus ;;; Copyright © 2021 Simon Tournier +;;; Copyright © 2021 Sarah Morgensen ;;; ;;; This file is part of GNU Guix. ;;; @@ -74,12 +75,8 @@ Import and convert the JSON package definition in PACKAGE-FILE.\n")) (define (guix-import-json . 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