From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id WO50DdK3EWaiWgAAqHPOHw:P1 (envelope-from ) for ; Sat, 06 Apr 2024 23:00:02 +0200 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id WO50DdK3EWaiWgAAqHPOHw (envelope-from ) for ; Sat, 06 Apr 2024 23:00:02 +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=blxETsTe; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1712437202; 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=Q0SRyun80Lde5mN1XAdiXJbpDbMznnG5J8dbBZ0eWvk=; b=LCVJcUUhE8hBxmIkQHR3MPxnGBevjPB++WNz2KVw3Y2nqgCQe2QsMJkcXYOvAyCEzJOF3C Wi/wZh9B9QnBAzo0b1LIPChpTR/noQHpN6/Vm5w5WHyPMYglchk97Jbqjx1XvmUlQZZb1N WS9dU1FV6y8Mb1ouBv3mM3QdEFDIohagiusUt8XNjlZ8T3MgvJMlGx7rKis1+W/izWwsHs Fywr6eLnfcvP4ZoezmEMrhHC9sb6+yQFIU7xnKpcaWXAiEZA4UenVxdaQh6ljJRWI1ZH7S escbC4GL1k2VXmMEu0pfcPf89VdWgqyBkaMH/i39T80nTMtQ9Z07cZARs8te6Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1712437202; a=rsa-sha256; cv=none; b=NgoOi/EMIqNyQuxW4togvJBYzLo5OixHBkia3P4idV9a8+6CRB/B1uYYH8U03X4IKIn22J JvHko+d3MwjxbYhDoZIU69DLEKcdh0fwnJTdisCEx2nfXYxnJNm/2hFzQs3T7lGnJxDRrD oQpYpFAFDFEd1omkng5/e2PYu3yFUe9/EdngvDNG9ZIeMmqy59hUCpvZ453uY0ygNNbO69 J/JIYvoHCdKqyhq2+jnXSbCmmhRTguO0N7DaXxC/hqrLnatuKkeTa7wV1ICbqUfJJdbxh2 Ztt+Te7vWaF55v0KbQUWPfO/Xvskl892TnNqYxs4sZzMxrxHuaUkkTLngPDpbQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=koszko.org header.s=mail header.b=blxETsTe; 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"; dmarc=pass (policy=none) header.from=gnu.org 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 E268720CDF for ; Sat, 6 Apr 2024 23:00:01 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rtD8X-0006Pk-6w; 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 1rtCnV-0001gP-Oo for guix-patches@gnu.org; Sat, 06 Apr 2024 16:37:57 -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 1rtCnV-0003Md-Fo; Sat, 06 Apr 2024 16:37:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rtCna-0005o6-0L; Sat, 06 Apr 2024 16:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70245] [PATCH 1/2] scripts: system: Rename `sqlite-register'. 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:01 +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.171243587022221 (code B ref 70245); Sat, 06 Apr 2024 20:38:01 +0000 Received: (at 70245) by debbugs.gnu.org; 6 Apr 2024 20:37:50 +0000 Received: from localhost ([127.0.0.1]:41047 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rtCnM-0005m8-T8 for submit@debbugs.gnu.org; Sat, 06 Apr 2024 16:37:49 -0400 Received: from koszko.org ([93.95.227.159]:49040) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rtCnL-0005m0-37 for 70245@debbugs.gnu.org; Sat, 06 Apr 2024 16:37:48 -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=Q0SRyun80Lde5mN1XAdiXJbpDbMznnG5J8dbBZ0eWvk=; b=blxETsTeemjIVKuSI2Yx5ERHha 288+mdBeQkNTg6s6ATdvIx2szlx90TgQdkKWCT4Dru8ifu7LpZpTHhSkOhrqCalzaADW70Gxc4peN yXCdCYzVKvPZtLKZG/zxFGB5pvWaBiORsgistorjR8JEuPiJ7qrQxA586C7R9VMc7gJY6S0fSitqV WH5Q5K14drWgY+9NRiMr371gh4X/4tcjTlqYZwmZzBNGCSIgSJ2MPhYdZWf3hyxKDr46xKuc1ApI9 dSFqygyoeLeoKwUsW1V4TVSdXOQr+zLdvX2M/pI7hUz+DDmq1ligkeM8N9eP8ASbzey5DzHnBcJfP AwHcU9k5JpWgXG05b16wtxwwzgQp2fT2MJrqYjW7ByD4dz9bGDR6D8DRbKt3hcUd54UfCylnr/hD/ 3RMGkcPZAzF1ROgUGcrAd78AIbcTVScf6bNMHHn/x+IANsApPIcx0ijdU+/9ra3BcozHh6XsoIYoS J8UBMx7qmfcJqPk+dS8bh6pXWYmFo7TllNSljTwFZt04wRBqQd3QKMIIwiPNyWIqTiF3czKL1xBV5 65Pa5dz7GbE6xFR03pv7Ydqxt/Uq5ygw/u4FJhwuu23CBYPgBdCw/QG9OqnI0Vl8+6kCAEVtZLEVS J0FMe0nNGpC1ahAzBuyqFkxZf0B42k+MLiw2PDyL8=; 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 1rtCnD-00005T-35; Sat, 06 Apr 2024 22:37:40 +0200 Date: Sat, 6 Apr 2024 22:37:07 +0200 Message-ID: <56efa64d914f75e8bb147b1f4b46bb1f21efc78b.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-Spam-Score: -4.86 X-Migadu-Queue-Id: E268720CDF X-Migadu-Scanner: mx12.migadu.com X-TUID: xPrCFIvQSqCh * guix/scripts/system.scm (define-module): #:autoload `register-valid-path' instead of `sqlite-register'. (copy-item): Call it with the new name. Change-Id: I24f71f822a5f400a47adee43f61184a4fbcb9741 --- guix/scripts/system.scm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index bf3d2f9044..67020a2aab 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -35,7 +35,7 @@ (define-module (guix scripts system) #:use-module (guix store) #:autoload (guix base16) (bytevector->base16-string) #:autoload (guix store database) - (sqlite-register store-database-file call-with-database) + (register-valid-path store-database-file call-with-database) #:autoload (guix build store-copy) (copy-store-item) #:use-module (guix describe) #:use-module (guix gexp) @@ -158,14 +158,15 @@ (define* (copy-item item info target db (copy-store-item item target #:deduplicate? #t) - (sqlite-register db - #:path item - #:references (path-info-references info) - #:deriver (path-info-deriver info) - #:hash (string-append - "sha256:" - (bytevector->base16-string (path-info-hash info))) - #:nar-size (path-info-nar-size info)))) + (register-valid-path db + #:path item + #:references (path-info-references info) + #:deriver (path-info-deriver info) + #:hash (string-append + "sha256:" + (bytevector->base16-string + (path-info-hash info))) + #:nar-size (path-info-nar-size info)))) (define* (copy-closure item target #:key (log-port (current-error-port))) -- 2.41.0