From patchwork Mon Mar 29 10:18:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 28167 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 E633827BC64; Mon, 29 Mar 2021 11:19:57 +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 48FF527BC63 for ; Mon, 29 Mar 2021 11:19:57 +0100 (BST) Received: from localhost ([::1]:60766 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lQp00-0007Oy-Gi for patchwork@mira.cbaines.net; Mon, 29 Mar 2021 06:19:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34290) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lQozK-0006oz-Dr for guix-patches@gnu.org; Mon, 29 Mar 2021 06:19:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36377) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lQozB-0003mN-Hh for guix-patches@gnu.org; Mon, 29 Mar 2021 06:19:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lQozB-0008Ly-Da for guix-patches@gnu.org; Mon, 29 Mar 2021 06:19:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47464] [PATCH 7/8] scripts: search: 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:05 +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.161701311232017 (code B ref 47464); Mon, 29 Mar 2021 10:19:05 +0000 Received: (at 47464) by debbugs.gnu.org; 29 Mar 2021 10:18:32 +0000 Received: from localhost ([127.0.0.1]:47915 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQoye-0008KE-4F for submit@debbugs.gnu.org; Mon, 29 Mar 2021 06:18:32 -0400 Received: from mail-wr1-f41.google.com ([209.85.221.41]:37449) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQoyU-0008If-8M for 47464@debbugs.gnu.org; Mon, 29 Mar 2021 06:18:22 -0400 Received: by mail-wr1-f41.google.com with SMTP id x16so12250529wrn.4 for <47464@debbugs.gnu.org>; Mon, 29 Mar 2021 03:18:22 -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=bUCKUsBcKKwSXvAaa7Y6H8+p+39h3xwgBnCnFc0JwZE=; b=U02m8/mB5oIZ4LqNrxeidTYqXojsMVhbtBXAF/rAD/hoIXC7DUk1xLYiG3qrUNFQHB xlCwykEUtxduVube6UWs8LbKzlNMVHIOR1mIPgdW+oe57SYHwqzwee6zDRRHkcbqPzco g5M1hBrobmxaRMc9dCwqbHRqluOvGnAWvp0Jd7PwFfJULDKfT0QHve4au4ph7aAR5FeB ru9wfbi3O00ko1KAxVizouTmyfBH9VQURyb++NxQcHSoZ70S3PSm7G5hZeML6AVWvj5N dg08lI88juCQ2aMZv5MVNuohR6T0B9fHeLIJ45whQsaYHXT0wOwxvhq+u/XNwzTd3HfF pKVw== 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=bUCKUsBcKKwSXvAaa7Y6H8+p+39h3xwgBnCnFc0JwZE=; b=P/VudlG1wumySbOq6J/1vv5tNp7fF1HMCMw2HamY3A7s3ubw0Rul1Xf6plqFojjeG+ IA6V6r+Toia3FoR9zP1gXKhdGrlpq6LIGkyWiMQ2W0clneYnJ/NxH674/q2qLYnhJyRU 8yVemJDQ3KTXRHBbLQcg36ZPQlMkf9XTVQLbg1FLS3n/hRpzfQDQEEBaQp0DDak0nbWR 4cqo/6QtJXZNLdkpWP3u52YB7DQxDHne3jkJTANFbJ2rrON2aWGcCs/Fg3mLrSmGKoS1 oYnuk5RQsUbLwOYvpyIoefp+rvuXXakH2uT9VVU5g4TP2I8qA/G7sGOVpKEtzDt7G+vB RMrg== X-Gm-Message-State: AOAM533T+bqh0ZYHG8+c7SKWVMLpiHGiTK54oMko1XbVTJ9ptHDWy3Ej LQa4XnVgk+CD82u9DBxEw9AJLk8Bbdo= X-Google-Smtp-Source: ABdhPJx3RomO7Fx0cdxsJsmo8rwylgULGPW4Nq93mRK8dp6YYPR6Dt1MTfC9NOtSvoljwTvxH8oCdw== X-Received: by 2002:adf:ea8b:: with SMTP id s11mr28682566wrm.413.1617013096742; Mon, 29 Mar 2021 03:18:16 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.110]) by smtp.gmail.com with ESMTPSA id 135sm25291792wma.44.2021.03.29.03.18.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Mar 2021 03:18:16 -0700 (PDT) From: zimoun Date: Mon, 29 Mar 2021 12:18:05 +0200 Message-Id: <20210329101806.54004-7-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/search.scm (define-command): Replace 'args-fold*' by 'parse-command-line'. --- guix/scripts/search.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/guix/scripts/search.scm b/guix/scripts/search.scm index 0c9e6af07b..27b9da5278 100644 --- a/guix/scripts/search.scm +++ b/guix/scripts/search.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019, 2020 Ludovic Courtès +;;; Copyright © 2021 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -66,11 +67,9 @@ This is an alias for 'guix package -s'.\n")) result)) (define opts - (args-fold* args %options - (lambda (opt name arg . rest) - (leave (G_ "~A: unrecognized option~%") name)) - handle-argument - '())) + (parse-command-line args %options (list (list)) + #:build-options? #f + #:argument-handler handle-argument)) (unless (assoc-ref opts 'query) (leave (G_ "missing arguments: no regular expressions to search for~%")))