From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id OCDtLYB4A2GrmwAAgWs5BA (envelope-from ) for ; Fri, 30 Jul 2021 05:56:48 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id sAyIKYB4A2HPcgAAB5/wlQ (envelope-from ) for ; Fri, 30 Jul 2021 03:56:48 +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 823332D6B6 for ; Fri, 30 Jul 2021 05:56:48 +0200 (CEST) Received: from localhost ([::1]:45318 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m9Jdf-0000Lc-Ln for larch@yhetil.org; Thu, 29 Jul 2021 23:56:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59510) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m9Jd0-00071n-Sw for guix-patches@gnu.org; Thu, 29 Jul 2021 23:56:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47160) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m9Jd0-0006Gc-Gz for guix-patches@gnu.org; Thu, 29 Jul 2021 23:56:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m9Jd0-0003wL-GV for guix-patches@gnu.org; Thu, 29 Jul 2021 23:56:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49780] [PATCH 14/14] import: stackage: 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:06 +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.162761735315036 (code B ref 49780); Fri, 30 Jul 2021 03:56:06 +0000 Received: (at 49780) by debbugs.gnu.org; 30 Jul 2021 03:55:53 +0000 Received: from localhost ([127.0.0.1]:58693 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m9Jcn-0003uN-CX for submit@debbugs.gnu.org; Thu, 29 Jul 2021 23:55:53 -0400 Received: from out0.migadu.com ([94.23.1.103]:28551) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m9Jcd-0003u5-Vw for 49780@debbugs.gnu.org; Thu, 29 Jul 2021 23:55:44 -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=1627617343; 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=Et/xDvqAPx2iplIss0MzIO4u2o99BjZXvN7qPczCk28=; b=AqhqRqqfZMzgh/r/MJxYRMqhMVfVnNzjj9ojPvSNhFE7rGDxAP0SJCoAfnIZ0r/RuYoqaB y++Ihk9XOW/i0WXXtgBbhiLIx5fa7Drb+hh2YhMT85TOH14aDmCAjn+kwcIliuNd+ySp8k J/CGF8sL1zxlLoRAKOWu0R5jzDJKjp8= From: Sarah Morgensen Date: Thu, 29 Jul 2021 20:55:10 -0700 Message-Id: <8dcfa87ce142e999afef7896c4d1bb58746e50a6.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=1627617408; 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=Et/xDvqAPx2iplIss0MzIO4u2o99BjZXvN7qPczCk28=; b=n+LkysKj0JEmJdUL3cY37OJFmLA8Ublp2UBEeo5Dxq08fQFXV/z4T5U3KW9jKJEsD/mjwK pGG1eWcEB27ljqQ448QP6QyV0fbt+BAtztJwRf1BvfPKsgX+5jWzM8xjeVjVyHJqqlV1fc 24ZiCDYqL2pG8EgNHpYdS/E4sf/1l2yAu66y9D/jBbQavTeg0hdGeJBPWBCJ5cRswby5Q2 HN/z05O3zyjyT6nOZAEDYxczoPuIs5naZKi2YLeEVcDUmBxFNP+1wn7Tq1BzKv0rhLyPc2 ehtXTxd963sFmiGsiq9JWMK3MBuX7HTltwYDMZt3T3XRtOGMhYWJ5UwRqxCh8g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1627617408; a=rsa-sha256; cv=none; b=Z35psaPCktSaSeIai3f5UTy3eq60one/w8hNECpvsiDO31SZMvHZwCwBOPh8bHculeK+RP 5pZAp75FkGp8dBDtAwksAhzGE9kUBX/kSm1nw6hkF8LFBsSE3m565sokcgNNIiVb6MxT6R mflcB67wcktYUe/olZXeNXr1s+V99/KHVN/PGjnKZ6w+aJe+/zquI1hXZqW5EX0OdhKhho 5UNbt7f1aWbV2QSv3L41esIy7XlQWmtVwuBN/tZ028NzsjdLsU0eq9xMN+TUU+zM7UePRc JTh3JBW2D65AntQzV9KWt28bJD/D96Jn5pk5jGYPTb7ZN4aA51c/d4Hc2nyKgw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=AqhqRqqf; 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=AqhqRqqf; 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: 823332D6B6 X-Spam-Score: -0.31 X-Migadu-Scanner: scn1.migadu.com X-TUID: jnsFbbSww5UH guix/scripts/import/stackage.scm (guix-import-stackage)[parse-options]: Use PARSE-COMMAND-LINE instead of ARGS-FOLD*. --- guix/scripts/import/stackage.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/guix/scripts/import/stackage.scm b/guix/scripts/import/stackage.scm index d77328dcbf..211ac73ada 100644 --- a/guix/scripts/import/stackage.scm +++ b/guix/scripts/import/stackage.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Federico Beffa ;;; Copyright © 2018 Ricardo Wurmus +;;; Copyright © 2021 Sarah Morgensen ;;; ;;; This file is part of GNU Guix. ;;; @@ -89,12 +90,8 @@ Import and convert the LTS Stackage package for PACKAGE-NAME.\n")) (define (guix-import-stackage . 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)) (define (run-importer package-name opts error-fn) (let* ((arguments (list -- 2.31.1