From patchwork Fri Feb 3 22:14:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46658 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 66B8027BBEB; Fri, 3 Feb 2023 22:15:16 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 11C6C27BBE9 for ; Fri, 3 Feb 2023 22:15:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pO4Kn-00076V-Ft; Fri, 03 Feb 2023 17:15:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pO4Kk-00075l-V5 for guix-patches@gnu.org; Fri, 03 Feb 2023 17:15:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pO4Kk-0002sh-MH for guix-patches@gnu.org; Fri, 03 Feb 2023 17:15:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pO4Kk-00057U-HC for guix-patches@gnu.org; Fri, 03 Feb 2023 17:15:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61255] [PATCH 1/5] pack: Extract keyword-ref procedure from debian-archive. References: <20230203161926.26886-1-maxim.cournoyer@gmail.com> In-Reply-To: <20230203161926.26886-1-maxim.cournoyer@gmail.com> Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Feb 2023 22:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61255 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61255@debbugs.gnu.org Cc: Josselin Poiret , Tobias Geerinckx-Rice , Maxim Cournoyer , Simon Tournier , Mathieu Othacehe , Ludovic =?utf-8?q?Court=C3=A8s?= , Christopher Baines , Ricardo Wurmus Received: via spool by 61255-submit@debbugs.gnu.org id=B61255.167546248419589 (code B ref 61255); Fri, 03 Feb 2023 22:15:02 +0000 Received: (at 61255) by debbugs.gnu.org; 3 Feb 2023 22:14:44 +0000 Received: from localhost ([127.0.0.1]:40082 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pO4KS-00055s-0p for submit@debbugs.gnu.org; Fri, 03 Feb 2023 17:14:44 -0500 Received: from mail-qt1-f175.google.com ([209.85.160.175]:33477) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pO4KP-00055d-Ol for 61255@debbugs.gnu.org; Fri, 03 Feb 2023 17:14:42 -0500 Received: by mail-qt1-f175.google.com with SMTP id h24so7264978qtr.0 for <61255@debbugs.gnu.org>; Fri, 03 Feb 2023 14:14:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=1tCEe77lSi5a/2D2uDeKtzZK4rdgFepvO/vGfX1i2Zw=; b=abydkFdY24dNgWn30IjQFyUvoKal7KAUebq5+22vKpRS3cr+inlB2DGJm/F5TQDZIM buWiyoREJIUoQ7iau32c6pqUnd5jOxE1wM5jL2gK6OYe0bCLA7wU1MA4SdLU7z/Jalyb dwdqCG9jo8d03s8OUMBv6RXKhNYJG9V/C4o3/K7NuzrbVPkzqsgn3gMKfTJKegki3F1e RYizsMYqDDbX8NLjF6evFiS6KR1iDGzUe+TsXPVZY4V26PiQe9PK/81wQ7UfQKG5rRu3 gJQjyxydX68Xnb5SFMbRkXbK4dXZ/hLpJxoFRZLPKNK2qOWn/VhIVailAILDmqyYO//x 3U5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=1tCEe77lSi5a/2D2uDeKtzZK4rdgFepvO/vGfX1i2Zw=; b=dVLbJukN/5zf/cxcFRuJLwAgNxuWE1gOvsjE4/uaeZiezz3MZRgFNyXUy0952cOro4 BqRIMDRJ/t6kyAumkedPDgbz8rSjjNTSHIULBaW1jCu1P2Rr9x5/GcSqlY7Kotxm78u9 VSQb82cGNVDtFsE8QcWmXq1NUMT8b6qTQgDYd8X4TQKu7K7FrgYjItmAypnuE4HiPPqO +yz3w+nX0iwSlz3upLk0nzICCo4MGOgEj9Q1V854X8juXQ9Pj4wVPPbA/mxL4R/N6409 A/aTTf9OQGmV1TrKm3VLcclj6NWHlBKjr/K9H3kkT9A/LvHTxlh5BUd9wGHYh1pvbD57 ogdQ== X-Gm-Message-State: AO0yUKXjzNJXlqXutqlrnDlieB6mLuOQ4mxszGbRXqbLSfC6pTH0tgel VLItr2GOwgoHfwHPYOObOkDmh7HSLcE= X-Google-Smtp-Source: AK7set83iyQ21mQhRtUAxzcB/k5XHhp1rSXyXEzRMIFM2kdXRPn1kP+PzVxK82V15Tuw0yu9m7Y1NA== X-Received: by 2002:ac8:5e10:0:b0:3b9:a60f:b2bb with SMTP id h16-20020ac85e10000000b003b9a60fb2bbmr22531074qtx.56.1675462475943; Fri, 03 Feb 2023 14:14:35 -0800 (PST) Received: from localhost.localdomain (dsl-10-136-177.b2b2c.ca. [72.10.136.177]) by smtp.gmail.com with ESMTPSA id bp41-20020a05620a45a900b00725d8d6983asm1430594qkb.61.2023.02.03.14.14.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Feb 2023 14:14:35 -0800 (PST) From: Maxim Cournoyer Date: Fri, 3 Feb 2023 17:14:04 -0500 Message-Id: <20230203221409.15886-2-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Rationale: the upcoming rpm-archive builder will also use it. * guix/scripts/pack.scm: (keyword-ref): New top-level procedure, extracted from... (debian-archive): ... here. Adjust usages accordingly. --- guix/scripts/pack.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index f65642fb85..7e466a2be7 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -194,6 +194,12 @@ (define (symlink-spec-option-parser opt name arg result) (leave (G_ "~a: invalid symlink specification~%") arg)))) +(define (keyword-ref lst keyword) + "Return the value of KEYWORD in LST, else #f." + (match (memq keyword lst) + ((_ value . _) value) + (#f #f))) + ;;; ;;; Tarball format. @@ -762,20 +768,15 @@ (define data-tarball-file-name (strip-store-file-name (copy-file #+data-tarball data-tarball-file-name) - (define (keyword-ref lst keyword) - (match (memq keyword lst) - ((_ value . _) value) - (#f #f))) - ;; Generate the control archive. (define control-file - (keyword-ref '#$extra-options #:control-file)) + #$(keyword-ref `(,@extra-options) #:control-file)) (define postinst-file - (keyword-ref '#$extra-options #:postinst-file)) + #$(keyword-ref `(,@extra-options) #:postinst-file)) (define triggers-file - (keyword-ref '#$extra-options #:triggers-file)) + #$(keyword-ref `(,@extra-options) #:triggers-file)) (define control-tarball-file-name (string-append "control.tar"