From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id 6J8TN9W3EWagEgAA62LTzQ:P1 (envelope-from ) for ; Sat, 06 Apr 2024 23:00:06 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id 6J8TN9W3EWagEgAA62LTzQ (envelope-from ) for ; Sat, 06 Apr 2024 23:00:06 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=koszko.org header.s=mail header.b=HSGxHpeA; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1712437205; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=FBvqV++nfaDEVLp+hFpTREUfLZZbSw5Ovhe3Hj3wVTQ=; b=o2Kh/E4/sAcnnZtsKXMR91LOti6lt/mRE5Hu2L389qNFLFUWdqdc0aCDWF08Iu1qNd1PXF 1Qphuw5PS3LGj2v3Qu1uZoLCLARGeMXd3xEde13whI5Xyu9FwB56C6+IYPPHrDMLwTkzaP M43CK+SoMfx7lH7X1/QrHJ3fSORw3Pk2V6XZuNBQT/gLCfKKBzJYnSpO5I7N+48m5XsD4m WrZJPQWylvNMNC6FDhM2kJpus/SByooXwBk37ElT77DZZQ9aARfdNxYAFXTNtJ9F7/rgxZ EVcpYIWVlLT8zjdUvwst3dkCvNBD/O+syEXxAG13HnQrNP5GPYLo23kgOLE28w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=koszko.org header.s=mail header.b=HSGxHpeA; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1712437205; a=rsa-sha256; cv=none; b=BJGI9Pd5LnOfq9IilR4glI+fb8eYsOOxsJgZBze4YTsc3ELsfiOw7H7QBYxxtJ+ShJqWkb WUf8siKR3wFLgg26Xdl/EG12Ibuwp88v+5nLBnabgKhushujHY8yvGetaYBSRjHgHNPb+3 5EcTl28PH+UV6CDADKz84LfKXKhCzfm7eC5okTTyG2XBQ5UuCDBNUbIA3w4ELQypGH2AM+ IV3ufhAVQZgFL4KivoWNtkR2tPI0Hw3adbaFNhgIp5BunRJuXI7SRfdURBxY7Lp06vnBKt qAfZ9kCIgcbc/kiCfiM2qpR2zvnhFxFmnaYMfkofg4ACVl4I1XIWC1F7hGc3Qw== 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 9BD897017D for ; Sat, 06 Apr 2024 23:00:05 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rtD8X-0006PL-6j; Sat, 06 Apr 2024 16:59:41 -0400 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 1rtCnW-0001gZ-EN for guix-patches@gnu.org; Sat, 06 Apr 2024 16:37:58 -0400 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 1rtCnW-0003Mn-5p; Sat, 06 Apr 2024 16:37:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rtCna-0005oE-Dn; Sat, 06 Apr 2024 16:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70245] [PATCH 2/2] store: database: Use correct function name in assertion. Resent-From: Wojtek Kosior 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: Sat, 06 Apr 2024 20:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70245 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70245@debbugs.gnu.org Cc: Wojtek Kosior , Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice 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 70245-submit@debbugs.gnu.org id=B70245.171243587522270 (code B ref 70245); Sat, 06 Apr 2024 20:38:02 +0000 Received: (at 70245) by debbugs.gnu.org; 6 Apr 2024 20:37:55 +0000 Received: from localhost ([127.0.0.1]:41051 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rtCnS-0005n7-RB for submit@debbugs.gnu.org; Sat, 06 Apr 2024 16:37:55 -0400 Received: from koszko.org ([93.95.227.159]:49042) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rtCnN-0005mG-KC for 70245@debbugs.gnu.org; Sat, 06 Apr 2024 16:37:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=koszko.org; s=mail; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=FBvqV++nfaDEVLp+hFpTREUfLZZbSw5Ovhe3Hj3wVTQ=; b=HSGxHpeA/NBwqsYziF4HfyDXNH a8KrCQY1grNLoyl4wJf6G1t53pJT/ZnSpTP3kJzckcVtlBrBi1cgEN4loMiY1lTtsXHdZa4wnYrEI hjX1OM2NOZm2/g1HLi9OJZ3LYSTPNUrn+mRJw7Ik49r8+Q0qwRh9eTMW6WHiG2uYWMbSRzhtZmgom GjQm2SmVJz+erhaUf6SFKIb2BDQ2PaeMMCGYj5Vx2Tw1VDLl9jhFCZtuMBNNy4RjMCeK5HvKMdqps Pc409VW1XsKdMUdJ3whDVXVOGWBD9DAMAAfM5zLHJAFrQ1sZ+iRuhXa5yqsDbsCjoFI06MTQ6pZB2 X4DBgGSkf88QGd9ehWtqOZbohGZHmvSePnan1ZieJQCKuVLRSjsb8lG0cJLjepzHcWeCVw3ouVbMv BDKJEUfRwgE/uPIf2yfHOw+6NC3/nbcgFhlBo2rvHaJvlYG3yDd+/nBIGExJVdl7ukr08zKz8hpfJ h7MDuRK5ufaF43d04dONqmt9bZuX/HrsDRMKdFq0o2eTURRWcY156KH+5LpRb6Uhq76+Pa/sVlT7q n1PHABYfSCETyUETe9ERVOBpqabnL9G3APs9hlF3QLErN+Cfi9b5JHoDkoDhl8pU23Mdwbj0aMXXD Dopg5+jhFN9r5YLJxP9yO9a0+DmZeenBrMlcGtcwk=; Received: from 78-11-235-220.static.ip.netia.com.pl ([78.11.235.220] helo=localhost.localdomain) by koszko.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96.1) (envelope-from ) id 1rtCnG-00005T-1a; Sat, 06 Apr 2024 22:37:42 +0200 Date: Sat, 6 Apr 2024 22:37:08 +0200 Message-ID: <7ccff5eb36b8ffe0713660f843165677447e1023.1712435265.git.koszko@koszko.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Sat, 06 Apr 2024 16:59:40 -0400 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Wojtek Kosior X-ACL-Warn: , Wojtek Kosior via Guix-patches From: Wojtek Kosior via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -4.86 X-Migadu-Scanner: mx11.migadu.com X-Spam-Score: -4.86 X-Migadu-Queue-Id: 9BD897017D X-TUID: jDMU7B32xbmK * guix/store/database.scm (register-valid-path): Replace "sqlite-register" with "register-valid-path" as argument to `assert-integer'. Change-Id: Id93687e90d0a806d715006ca0b2498a1d10cfba6 --- guix/store/database.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/guix/store/database.scm b/guix/store/database.scm index 58d3871e85..a847f9d2f0 100644 --- a/guix/store/database.scm +++ b/guix/store/database.scm @@ -247,8 +247,9 @@ (define* (register-valid-path db #:key path (references '()) (time-second time)) ;; Make sure NAR-SIZE is valid. - (assert-integer "sqlite-register" positive? #:nar-size nar-size) - (assert-integer "sqlite-register" (cut >= <> 0) #:time registration-time) + (assert-integer "register-valid-path" positive? #:nar-size nar-size) + (assert-integer "register-valid-path" (cut >= <> 0) + #:time registration-time) (define id (let ((existing-id (valid-path-id db path))) -- 2.41.0