From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id yPPoD1l4A2GumwAAgWs5BA (envelope-from ) for ; Fri, 30 Jul 2021 05:56:09 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id WFiZC1l4A2E2KwAA1q6Kng (envelope-from ) for ; Fri, 30 Jul 2021 03:56:09 +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 09E7256FE for ; Fri, 30 Jul 2021 05:56:08 +0200 (CEST) Received: from localhost ([::1]:42728 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m9Jd1-0006oO-4s for larch@yhetil.org; Thu, 29 Jul 2021 23:56:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59426) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m9Jcw-0006lU-54 for guix-patches@gnu.org; Thu, 29 Jul 2021 23:56:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47148) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m9Jcv-00068y-U2 for guix-patches@gnu.org; Thu, 29 Jul 2021 23:56:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m9Jcv-0003uu-UD for guix-patches@gnu.org; Thu, 29 Jul 2021 23:56:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49780] [PATCH 02/14] import: egg: 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:01 +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.162761731814841 (code B ref 49780); Fri, 30 Jul 2021 03:56:01 +0000 Received: (at 49780) by debbugs.gnu.org; 30 Jul 2021 03:55:18 +0000 Received: from localhost ([127.0.0.1]:58657 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m9JcE-0003rI-6e for submit@debbugs.gnu.org; Thu, 29 Jul 2021 23:55:18 -0400 Received: from out0.migadu.com ([94.23.1.103]:28407) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m9JcC-0003r3-NC for 49780@debbugs.gnu.org; Thu, 29 Jul 2021 23:55:17 -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=1627617314; 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=m5BV66pUOEW6f8G2bNqZuFoJmOaPBm44iap7Jy8qQV8=; b=Z1Yz7fshH6FfHbeEqq2VHdV6eFqnMco9xTTmreSyo234iPI9QxCG1EumEKMdoYK+qJlVSl kr1kpYekIi3JBkC5oyOQwdur/EBzlR6LpZqkmw/bE6tj/nfoLMZbuHoUtdA4iwhjpJ+LFE C5uHtlv/cEGx9HQlT6IxLer7UZdkrcE= From: Sarah Morgensen Date: Thu, 29 Jul 2021 20:54:58 -0700 Message-Id: <5a19dcc9709dcacc09e08bfc7db6fb2c872ba596.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=1627617369; 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=m5BV66pUOEW6f8G2bNqZuFoJmOaPBm44iap7Jy8qQV8=; b=T2IrT49bqGnjVf9noDQnoHqd8XLPKz4L9qH68sbfRzuK1e4rFzH9EYISLFTEotdQbr0EWw iLCK7YWON8d4mbGGNH+EhiFV/gvC2zk6UAJsXtB7i3PzKDNKtATEdbbPINDxk+EZ/t15yT VJHXN+TP32w2dwHtOR+/pWic35TKv4hM/JrhHrORVDYkNvxYrsNS0LH7w4tYp8XA0v/ADH Btxg06LIbOkEDYJ5nCfLlJZZdIypY7ScaqztvEXDac7Rnx5ueDtI2d6YM1Zx7qONv8xPkS oYcelKNTMePV/fnlsE3L3EdtdufAlGgSy6pLb0ibMZF7JVRPJhIkky1hy1aemw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1627617369; a=rsa-sha256; cv=none; b=EYgGKtwCp80U7Qjd33CJUzvKeOAIrhxQwq3Xtc2aAq3hUVkyuAMiKi1wMyh/aJ0L+9l4jy rpVyjJGek9NgUAKLDE3b+Gvq3BkcuMvRGcNA/bAv4uMc9bNy5e2k8W6W6D3jBZSlHs8tx+ 7D/bPg8kEjeS6TwRiO0nswexgPxYF1bptA+ovv/9csW8n0RdzJvA6fpcNg5ZXYzHOyuha4 7bN2R/WmY8E1bJ27abOc2PTZU2kZ6dPBXFGoJ25odp/jiYVD2LqJJYUEpVpeeaDppRxPjP HsRyQq/b0uu722Qr5Ux5nmZnGepdKG+Vu33Y2RyfOYV8c9KMWISzoJXRlgsuFw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=Z1Yz7fsh; 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=Z1Yz7fsh; 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: 09E7256FE X-Spam-Score: -0.31 X-Migadu-Scanner: scn1.migadu.com X-TUID: JXcYGEGWIVwJ guix/scripts/import/egg.scm (guix-import-egg)[parse-options]: Use PARSE-COMMAND-LINE instead of ARGS-FOLD*. --- guix/scripts/import/egg.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/guix/scripts/import/egg.scm b/guix/scripts/import/egg.scm index 7dbd6fcd5a..829cdc2ca0 100644 --- a/guix/scripts/import/egg.scm +++ b/guix/scripts/import/egg.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2021 Xinglu Chen +;;; Copyright © 2021 Sarah Morgensen ;;; ;;; This file is part of GNU Guix. ;;; @@ -71,12 +72,8 @@ Import and convert the egg package for PACKAGE-NAME.\n")) (define (guix-import-egg . 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