From patchwork Thu Jan 11 23:41:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 58810 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 BAA5527BBE2; Thu, 11 Jan 2024 23:43:25 +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=-2.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 AC85727BBE9 for ; Thu, 11 Jan 2024 23:43:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rO4hd-0003ll-I5; Thu, 11 Jan 2024 18:43:14 -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 1rO4hb-0003gj-Pg for guix-patches@gnu.org; Thu, 11 Jan 2024 18:43:11 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rO4hZ-0006or-62; Thu, 11 Jan 2024 18:43:10 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rO4hS-0006HT-7V; Thu, 11 Jan 2024 18:43:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68392] [PATCH] scripts: pack: Set correct default value for entry-point-argument. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Thu, 11 Jan 2024 23:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68392 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68392@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz>, Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by submit@debbugs.gnu.org id=B.170501652824073 (code B ref -1); Thu, 11 Jan 2024 23:43:02 +0000 Received: (at submit) by debbugs.gnu.org; 11 Jan 2024 23:42:08 +0000 Received: from localhost ([127.0.0.1]:34298 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rO4ga-0006GD-6U for submit@debbugs.gnu.org; Thu, 11 Jan 2024 18:42:08 -0500 Received: from lists.gnu.org ([2001:470:142::17]:43662) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rO4gW-0006Fc-W8 for submit@debbugs.gnu.org; Thu, 11 Jan 2024 18:42:06 -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 <~@wolfsden.cz>) id 1rO4gQ-0003Eu-IE for guix-patches@gnu.org; Thu, 11 Jan 2024 18:41:59 -0500 Received: from wolfsden.cz ([37.205.8.62]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <~@wolfsden.cz>) id 1rO4gN-0006JF-Km for guix-patches@gnu.org; Thu, 11 Jan 2024 18:41:58 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id BE435250F20; Thu, 11 Jan 2024 23:41:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1705016512; bh=hSb83nMe0iX37PLvHB6xXbnEW1oqKb5g8BnJpaDPK8M=; h=From:To:Cc:Subject:Date; b=Ig8s/qfSrO0xDe53eODjiEElTNWllgdL8s/CLN1y0brGF4yk/iljXC+EccZg4gL4l YyazejK2yjqGtPIKx4WC5Sz0DfVCUSBuItQc4mG3krwJm31D2NH2+nQrInB6LmxXfe s8SE9ViXaG7Z5JLkNardR7gY7tWS4e2M/Ud6qJOmMHAmRx2iWLfonGmufARDKJKUav eWcorG4es6PRlziEwAr8IoAi8XUo1nAg4AOSGN3+Ezk26jrOccjrEVNrjnjEfLbtaG sAwHVkIe8lkWxsNkErJ3Ia423QKcITAHaLQDSI/eBZvt719YxtmUvGqfh/neNbe8kf wXuChisktj91K5ZSOLfDJyBo1YMXC2PZRgKVKhxzpxycVKA5EEySIzhc1GwNoghz/O PBgrM71bhCX+eaGpKEyz2USRY858b7uKv17eScTGWZogG7lvsh7bQ74jdrhwGoP9pK ww+eHiHYAFZJhbStW8OTvXLOKHNtLJ/8R7BdAQJ3jfpNLATzhRG0ZLmc1NFg+4d0Tz gPy19qJgFnGw0rSrqmQbTQ9rdECcBskvFvi7oQEbeZz6obheL4S1dJqh/z6bgqI1Bn wxaljsKWAREAPcAu44ojiaA+SsMJj1ROg4+ktYqI6iUzfFLem9awBjtAY9+HyDNDQa R5E3ELpkktzt2e7eQWKee9ww= Received: from localhost (unknown [193.32.127.158]) by wolfsden.cz (Postfix) with ESMTPSA id 6086224FF5E; Thu, 11 Jan 2024 23:41:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1705016512; bh=hSb83nMe0iX37PLvHB6xXbnEW1oqKb5g8BnJpaDPK8M=; h=From:To:Cc:Subject:Date; b=Ig8s/qfSrO0xDe53eODjiEElTNWllgdL8s/CLN1y0brGF4yk/iljXC+EccZg4gL4l YyazejK2yjqGtPIKx4WC5Sz0DfVCUSBuItQc4mG3krwJm31D2NH2+nQrInB6LmxXfe s8SE9ViXaG7Z5JLkNardR7gY7tWS4e2M/Ud6qJOmMHAmRx2iWLfonGmufARDKJKUav eWcorG4es6PRlziEwAr8IoAi8XUo1nAg4AOSGN3+Ezk26jrOccjrEVNrjnjEfLbtaG sAwHVkIe8lkWxsNkErJ3Ia423QKcITAHaLQDSI/eBZvt719YxtmUvGqfh/neNbe8kf wXuChisktj91K5ZSOLfDJyBo1YMXC2PZRgKVKhxzpxycVKA5EEySIzhc1GwNoghz/O PBgrM71bhCX+eaGpKEyz2USRY858b7uKv17eScTGWZogG7lvsh7bQ74jdrhwGoP9pK ww+eHiHYAFZJhbStW8OTvXLOKHNtLJ/8R7BdAQJ3jfpNLATzhRG0ZLmc1NFg+4d0Tz gPy19qJgFnGw0rSrqmQbTQ9rdECcBskvFvi7oQEbeZz6obheL4S1dJqh/z6bgqI1Bn wxaljsKWAREAPcAu44ojiaA+SsMJj1ROg4+ktYqI6iUzfFLem9awBjtAY9+HyDNDQa R5E3ELpkktzt2e7eQWKee9ww= From: Tomas Volf <~@wolfsden.cz> Date: Fri, 12 Jan 2024 00:41:47 +0100 Message-ID: <6c246d4964dfc383d7f8dff5184772fd09553050.1705016507.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=37.205.8.62; envelope-from=~@wolfsden.cz; helo=wolfsden.cz X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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 The default value of #f let to ("..." . #f) being passed further down as a entry point. That was not an issue for command line invocation, since there '() was already used as a default value, but it broke docker system test with following error: building /gnu/store/dll8jj6h5pfgf6ya9skk1g1546smwbib-docker-pack.tar.gz.drv... tar: Removing leading `/' from member names Backtrace: 6 (primitive-load "/gnu/store/g8hqzccfvn4mkm41jqs65c27gs7?") In ./guix/docker.scm: 268:6 5 (build-docker-image "/gnu/store/zi2f5dfdrhviinm6jxp3cj?" ?) In ice-9/ports.scm: 433:17 4 (call-with-output-file _ _ #:binary _ #:encoding _) 476:4 3 (_ _) In ./guix/docker.scm: 270:21 2 (_) 123:40 1 (config "1996ead589ab366473d935c4d5bd0c38b998f3b299847?" ?) In unknown file: 0 (list->vector ("/gnu/store/1pvqd30qi1aigjdf7s7l8v7?" . #)) ERROR: In procedure list->vector: In procedure vector: Wrong type argument in position 1: ("/gnu/store/1pvqd30qi1aigjdf7s7l8v7wpvrrhfkj-profile/bin/guile" . #f) note: keeping build directory `/tmp/guix-build-docker-pack.tar.gz.drv-16' builder for `/gnu/store/dll8jj6h5pfgf6ya9skk1g1546smwbib-docker-pack.tar.gz.drv' failed with exit code 1 build of /gnu/store/dll8jj6h5pfgf6ya9skk1g1546smwbib-docker-pack.tar.gz.drv failed View build log at '/var/log/guix/drvs/dl/l8jj6h5pfgf6ya9skk1g1546smwbib-docker-pack.tar.gz.drv.gz'. cannot build derivation `/gnu/store/dq9qk1ba0f07572m8ck3xws28x1b3rif-docker-test.drv': 1 dependencies couldn't be built guix build: error: build of `/gnu/store/dq9qk1ba0f07572m8ck3xws28x1b3rif-docker-test.drv' failed make: *** [Makefile:7044: check-system] Error 1 Breakage was introduced in 7d5168a2af3ed922c6a46985124fb73402cc8844. * guix/scripts/pack.scm (docker-image)[entry-point-argument]: Default to '(). Change-Id: If5fc1f8bcb0981df11409636e71f2ca91b05612f --- guix/scripts/pack.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: 5c0f77f4241c9beac0c82deae946bfdc70b49ff0 diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index d0acc6cfd8..3e45c34895 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -597,7 +597,7 @@ (define* (docker-image name profile (let-keywords '#$extra-options #f ((image-tag #f) - (entry-point-argument #f) + (entry-point-argument '()) (max-layers #f)) (build-docker-image #$output