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 4Dk8Dnt4A2HmmgAAgWs5BA (envelope-from ) for ; Fri, 30 Jul 2021 05:56:43 +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 4JfxCXt4A2GnLAAA1q6Kng (envelope-from ) for ; Fri, 30 Jul 2021 03:56:43 +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 8E9E68D2B for ; Fri, 30 Jul 2021 05:56:42 +0200 (CEST) Received: from localhost ([::1]:44802 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m9JdZ-0008PX-In for larch@yhetil.org; Thu, 29 Jul 2021 23:56:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59466) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m9Jcy-0006tp-Th for guix-patches@gnu.org; Thu, 29 Jul 2021 23:56:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47155) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m9Jcy-0006DM-KY 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-0003vk-Ji for guix-patches@gnu.org; Thu, 29 Jul 2021 23:56:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49780] [PATCH 09/14] import: opam: 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.162761734114978 (code B ref 49780); Fri, 30 Jul 2021 03:56:04 +0000 Received: (at 49780) by debbugs.gnu.org; 30 Jul 2021 03:55:41 +0000 Received: from localhost ([127.0.0.1]:58681 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m9Jca-0003tU-Ps for submit@debbugs.gnu.org; Thu, 29 Jul 2021 23:55:41 -0400 Received: from out0.migadu.com ([94.23.1.103]:28474) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m9JcR-0003sZ-EH for 49780@debbugs.gnu.org; Thu, 29 Jul 2021 23:55:31 -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=1627617330; 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=Dh2AbnD8EIWx3k3E3nO64zmrPhb/z555zakDLcYtn9A=; b=g3tkc0ZQq1chnX3gxsArvIi4IO78e0he+Yac4Ci5SFpy99J9HyRq8dJMPexxlskdGuRhpP rhsaMuT8wM5h6ivu5n8cpW0ynheziKJAc0La2BbFtfmemi3r3Z0fbE057zrNX1DeUVkaLY W8O1rN7O/DGm9J9+7vuQ3WWrOpSriFU= From: Sarah Morgensen Date: Thu, 29 Jul 2021 20:55:05 -0700 Message-Id: <2f03c9d080eeec52abbe43db2c1c02099086c2b2.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=1627617402; 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=Dh2AbnD8EIWx3k3E3nO64zmrPhb/z555zakDLcYtn9A=; b=aQ5wUh5+GO8yJectOY4p12z5UJHlYaK6Afk0vwYcGX/yoxUAb02NBT2ZBlsmrRATjWDZxw x0ZBGM5ZVj1u5NxoN41nWuv03itXBADEAGa54NYs1ibHJSHhN6j7/513o/BQ/VCQBkmYVY 4uwJILCUqoQOrDYyNOp5yCgCQ0106ztL10+bksYrBuqe25HmpaAuGzu2Maxi4kl3vQCYHS owE7COUdmOjd8356rXmQcyWa+kIapLDvWAJt66t/GMic2LuFfVJb3we7OhKih0qUWEWqIt bnnvo4kiAO+PyPk5u6PMM1Px3BN7VhJnoavv+7O1uyrOIL065Xp/UHDwqcMn8w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1627617402; a=rsa-sha256; cv=none; b=jL9Zutq30VVf6xJWEajHMTi+agkt+rWZLGyLv7ytGvZ+97kKr+Lg9XKh2ppPkkfgRg9pci zd0pkqkfULmXH0fk/xPM/ER7dPUlzCAQ+XyFQWHT75rO4VII6Ne6lvE+qp96UihlrNbEMl fc5MMlVD9LEzjs1TMtqAFxYDPh7IOsGAHFG347f9b684N3OftGxdO0GyMRTu52ROtZ5Dbf fDU90RnFRT+YJ3496acGiu6KMjjnpXtneJC2mLwirUW+Jr5QbPtFSaCthe78hM4lnt8NN0 EI1f2ozCW9BCIj8B1IDZ2bh2PXYwkl+dIf9zfurEqtN5bF3VJT8EUnAr329DYA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=g3tkc0ZQ; 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=g3tkc0ZQ; 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: 8E9E68D2B X-Spam-Score: -0.31 X-Migadu-Scanner: scn0.migadu.com X-TUID: JEImMhBG4JMX guix/scripts/import/opam.scm (guix-import-opam)[parse-options]: Use PARSE-COMMAND-LINE instead of ARGS-FOLD*. --- guix/scripts/import/opam.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/guix/scripts/import/opam.scm b/guix/scripts/import/opam.scm index da9392821c..64164e7cc4 100644 --- a/guix/scripts/import/opam.scm +++ b/guix/scripts/import/opam.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Julien Lepiller +;;; Copyright © 2021 Sarah Morgensen ;;; ;;; This file is part of GNU Guix. ;;; @@ -76,12 +77,8 @@ Import and convert the opam package for PACKAGE-NAME.\n")) (define (guix-import-opam . 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)) (repo (and=> (assoc-ref opts 'repo) string->symbol)) -- 2.31.1