From patchwork Mon Mar 29 10:18:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 28165 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id DCE0827BC64; Mon, 29 Mar 2021 11:19:37 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7D53627BC63 for ; Mon, 29 Mar 2021 11:19:37 +0100 (BST) Received: from localhost ([::1]:60322 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lQozg-0007Dh-NI for patchwork@mira.cbaines.net; Mon, 29 Mar 2021 06:19:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34282) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lQozK-0006ov-DW for guix-patches@gnu.org; Mon, 29 Mar 2021 06:19:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36375) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lQozA-0003mG-Ie for guix-patches@gnu.org; Mon, 29 Mar 2021 06:19:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lQozA-0008Lj-EL for guix-patches@gnu.org; Mon, 29 Mar 2021 06:19:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47464] [PATCH 5/8] scripts: publish: Replace 'args-fold*' by 'parse-command-line'. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 29 Mar 2021 10:19:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47464 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47464@debbugs.gnu.org Cc: zimoun Received: via spool by 47464-submit@debbugs.gnu.org id=B47464.161701311132000 (code B ref 47464); Mon, 29 Mar 2021 10:19:04 +0000 Received: (at 47464) by debbugs.gnu.org; 29 Mar 2021 10:18:31 +0000 Received: from localhost ([127.0.0.1]:47911 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQoyd-0008Jy-9T for submit@debbugs.gnu.org; Mon, 29 Mar 2021 06:18:31 -0400 Received: from mail-wr1-f46.google.com ([209.85.221.46]:41945) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQoyT-0008Ic-9h for 47464@debbugs.gnu.org; Mon, 29 Mar 2021 06:18:22 -0400 Received: by mail-wr1-f46.google.com with SMTP id b9so12235537wrt.8 for <47464@debbugs.gnu.org>; Mon, 29 Mar 2021 03:18:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jACp6WVdik7pp5UW1CETJgM495WjLkuhCm5/rwSK0Dg=; b=nMmHNTR77eajRGoNRSyWx4QfNr3OdVts8IJBMBGSknsAUm8BlchusNo4zEMVcCK+/o qAheMwc/pKofhVoQ3cFvGhsC/IxD5hJzi0yB2cqCcBJv01Xa3VEFc2lLUuPzDgFOMcdR vWuX8IZbl1rXqmyHfyP55vLZ+AiOhLFCkcL6b/voqM/AgQJ63BmPD0/vA3r4sSZRhBVM ao+nj1LyfaDsCU+Av3odJXQmTA1BJVskaAwRd+rigTIQUTTyc4+coZPTRK7C5WpqwYba jEtAUfE+n7hQXbEF+gFjrXehZSoNGGcxGCa4qLcRmWvXVGZM44e1BI2I4GIj2owJnxbn +ysA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jACp6WVdik7pp5UW1CETJgM495WjLkuhCm5/rwSK0Dg=; b=U6PIzBl8jLfTc8+GJ2DtxlQlnox1iWbtFLjeJIUQB3UWm+L8wL2Q3rRxak8HkSB3P9 Rk5t7Mkyz7OpwqTmLvSMhdy6Nece0a6sXPE3+e2rwDwPU4WHb4am35sfoQgb9DS/cxTA BDWzvVFDPwj1o9uHZRWxBtJeh7fYJ/gO5rc0pTBDbpUebrwK6CaUbvz7Np6TzQQFqGKp JHClZ6jUrTmS7e40ztsIKUtGz7jrDNHeU41aLMRyYzxaea3iAbpo1RduooQ6zyL4/XJt 6yXx2DsKwH0qu013MTbuCpd66CFchuRdM/BKtKYvo/R9l/D0jHo220q2BEGqmWAX+Hhm U8Ig== X-Gm-Message-State: AOAM533Y+BEBqDB6b9GNsyZRVynBc+Aj/1ZIWZSmTaFvZWAnO710xGIJ VqFkDGm4emsFHxYnP4gfhMMhwPiHvxg= X-Google-Smtp-Source: ABdhPJyeLUXISiNEbuX7F353gcoEV+ZbsAZbRvXQCEyJz+F+3cJkfQmOOCqhXRgT6IuzNQLBXDkwuA== X-Received: by 2002:adf:f948:: with SMTP id q8mr28030686wrr.296.1617013095784; Mon, 29 Mar 2021 03:18:15 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.110]) by smtp.gmail.com with ESMTPSA id 135sm25291792wma.44.2021.03.29.03.18.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Mar 2021 03:18:15 -0700 (PDT) From: zimoun Date: Mon, 29 Mar 2021 12:18:03 +0200 Message-Id: <20210329101806.54004-5-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210329101806.54004-1-zimon.toutoune@gmail.com> References: <20210329101806.54004-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * guix/scripts/publish.scm (define-command): Replace 'args-fold*' by 'parse-command-line'. --- guix/scripts/publish.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/guix/scripts/publish.scm b/guix/scripts/publish.scm index fa85088ed0..39bb224cad 100644 --- a/guix/scripts/publish.scm +++ b/guix/scripts/publish.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2020 by Amar M. Singh ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2021 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -1117,12 +1118,11 @@ methods, return the applicable compression." (synopsis "publish build results over HTTP") (with-error-handling - (let* ((opts (args-fold* args %options - (lambda (opt name arg result) - (leave (G_ "~A: unrecognized option~%") name)) - (lambda (arg result) - (leave (G_ "~A: extraneous argument~%") arg)) - %default-options)) + (let* ((opts (parse-command-line args %options (list %default-options) + #:build-options? #f + #:argument-handler + (lambda (arg result) + (leave (G_ "~A: extraneous argument~%") arg)))) (advertise? (assoc-ref opts 'advertise?)) (user (assoc-ref opts 'user)) (port (assoc-ref opts 'port))