From patchwork Sat Nov 18 00:30:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maciej Kalandyk X-Patchwork-Id: 56593 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 652B327BBEA; Sat, 18 Nov 2023 00:37: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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS 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 86A2F27BBE2 for ; Sat, 18 Nov 2023 00:37:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r49Kd-0000kg-Ro; Fri, 17 Nov 2023 19:37:07 -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 1r49Kc-0000kV-4w for guix-patches@gnu.org; Fri, 17 Nov 2023 19:37:06 -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 1r49Kb-0002Dw-0L; Fri, 17 Nov 2023 19:37:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r49KX-0002FT-Mm; Fri, 17 Nov 2023 19:37:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67253] [PATCH] add guix locate database is locked error message(resent) Resent-From: Maciej Kalandyk 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, 18 Nov 2023 00:37:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67253 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67253@debbugs.gnu.org Cc: Maciej Kalandyk , 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.17002677658566 (code B ref -1); Sat, 18 Nov 2023 00:37:01 +0000 Received: (at submit) by debbugs.gnu.org; 18 Nov 2023 00:36:05 +0000 Received: from localhost ([127.0.0.1]:47321 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r49Jd-0002E5-Al for submit@debbugs.gnu.org; Fri, 17 Nov 2023 19:36:05 -0500 Received: from lists.gnu.org ([2001:470:142::17]:43902) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r49Ja-0002DX-AF for submit@debbugs.gnu.org; Fri, 17 Nov 2023 19:36:03 -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 1r49JS-0008Q0-MM for guix-patches@gnu.org; Fri, 17 Nov 2023 19:35:55 -0500 Received: from mail-am7eur03olkn20802.outbound.protection.outlook.com ([2a01:111:f400:7eaf::802] helo=EUR03-AM7-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r49JQ-00027o-7t for guix-patches@gnu.org; Fri, 17 Nov 2023 19:35:54 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gMP/ie6I7nHMWpEY4bQ3zZVxfWX6tWP//y79kFUznJ0d2SDx7bHiF6FLOh1NkPnuxJB4Vfl07j8tCAn6eO5l2LHog7xEFMQvDY6d9o+S49CIOojOin2rDjcr20Ky3tA1VB2/hKYxGhYy6HnuFvaBjMhQEqHOC0qFv5rdZpEcc69rMp70Ls5RKnczhANHf+FH6wC2iCEVdaM/Qkxim7Fz8Ue4coJxod+mRI/DhZq+goI0K06PB84BiFSwrBfFFzpOO08SsdScwi6r0RxnnnuPf8AW1WB9Svq3gYNbUM5kg0b3tcdPjv+hmcjGvOP56yTN/5uTzTOUsa1F2evRiZhZbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=3DXQq5+3Y6cuU7xVe4Kl4YOnZJMUPTJ5JdTD6kY5i6E=; b=Lr9bGxWpQGXbKw9hlNgGTDjEDpDM+ykNUhV0Zun1l8OEnm9QJU8xBiN2lA8WymbtbS5cAHlP2UAXyv8RSEMY4mEzN/MGNNDziOQxGOmQ/OYeu3zRYWwjKiHpxcgk5o+pQH+DK4ydglFhSSwE0LPYnzwN4l+44Hl/hbX/145sWth43VIsTY2qWsyRkwoYcbaC+DNpLw7zFMDVjpNrt4ZQTSogsWLFKDNHg/4yvNNIi6izvBnVdOAYuqilZRqmQ+Mb00bfzFOg0RqKMSWJaGTTTAxapEy7+VWFFpMBjIHDXyuXRYeECVQTZUGQ2rRQ8Y3L6pM33TgicKLOkiSF6xkkLw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3DXQq5+3Y6cuU7xVe4Kl4YOnZJMUPTJ5JdTD6kY5i6E=; b=LYdxjTHM9Rgu0Jod9mFOqoxBWoNQxNw5xPyOZPtXCIWX0jPzMYAgsrrk0yaLjwXG4/PpZPCN0i3HlUhicAerRg9WjJL6+aDbdBJXQSiEBfPKaKuKvEB1AwDP8b37wA1l1spW93X2ZahpVPsfAsUrq+r8KH3BqrLUIV35YLumIOb1st5y6xpgBn5/hmTZ2n5D4ECfaYOgARjcBwtDBkRn2MbbJiDABx+WBXYfsJ1AXdmTapofAz49IvghywT7fB39dj+xvt+jm0NYVbkXaJWPCYQcy8lf+Q93pgObf9h2+D5aXU2cRsYtsfTHDG/esEXN5eTGSYwOohMX1MYX9NSMfA== Received: from AM0PR10MB3586.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:157::23) by VE1PR10MB3837.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:800:164::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.23; Sat, 18 Nov 2023 00:30:46 +0000 Received: from AM0PR10MB3586.EURPRD10.PROD.OUTLOOK.COM ([fe80::d712:c565:e64a:7439]) by AM0PR10MB3586.EURPRD10.PROD.OUTLOOK.COM ([fe80::d712:c565:e64a:7439%4]) with mapi id 15.20.7002.025; Sat, 18 Nov 2023 00:30:46 +0000 From: Maciej Kalandyk Date: Sat, 18 Nov 2023 01:30:39 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [jajvlVr8hEcKyIFg26C1iS2pvm3zqtuW] X-ClientProxiedBy: FR4P281CA0235.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:e9::6) To AM0PR10MB3586.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:157::23) X-Microsoft-Original-Message-ID: <1e2c13dfb15cb197fb05381f4e3d8cd021d8dd2e.1700267338.git.m.kalandyk@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM0PR10MB3586:EE_|VE1PR10MB3837:EE_ X-MS-Office365-Filtering-Correlation-Id: 111f99b8-6ff0-42c7-b8a5-08dbe7cd99f4 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: x8TiC6dnh8H9fsidamtTWKyBl3IOQ7kbw24lbslE1U+j+iEJAD1mQ0LRtFoqKQwHzsm2aohNx80+KjNHSfw73oXACZu1cndnLxSV6rLhvvyaZnUcPp92uR5c7H+mFdeQ1BgnsUyEXhj4JLMfRcwO2/42Azb46o7MBmsroNJtGQ/f92aAmSFt1ZozL5+JLldN5FB3CJ8C6uan6ARcEPqM0+Ok1UP/9qtMuXNSrH5Q2/VtHkHIl4pIiXaNHRPfbhTEVnD/XOLQOIWYq86ksfEuKX4yn11uFbMGFW/Wn45FcC7uO6tRqY857d27A9b4PT+w6OYWVvhRydtE6IFzN4rlGjTHWy9xaNfg01tI0z06HpqOw8IopE5pMEx0bOuYz2I8fDYAjpUy+AboAiiWfCzN6D/gVthwDWwGw0xoRr/jtQm33RQ3Ziq3/50t+iJ7g+7YPRHq3og5dG+tt3rAwspUIYQfwrRuHZ4vJOC2WrY/8YI8eYx+UfzlR/3pNP1el+8AinrT0V3WmNhfAz0BNfmbnU9RwbzaUTuYDnAcP4RJJNd8PHeH7bd6VpOkH+Z4tLWmkZ6YeMbnG78yHPG/EPIu2+HACvbjlS3/UuFA+y/bpUCrTriJQT9IPvrPJ8pi2N3Z X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rlQqYGZ1tqlStmvcsYqNtOg64/KNbDI/k6OMw+28Hh/wekCAfeW9TayV4dBAjzt5ACa7UWOCgx4d/pqBcFBlZfVKTZre6wM3Eg0MZlisECiZy5fuwP3808A4dPjoGO2p7dc8LTvV9oWRo4oO+cqsgB1BQr26pSIziJrX2y4wP+a8LoZ2O+wdy7cuTzXU7AMwOXydPSI16WCdxPNbwbvaAdG5zU64j3qZH5a1F/F+q1eTbuuuKK+FTDlTSKRbUfk8jiwI2jOQN8zV2eKIEVcvvCRjdN446sDR/B45DSe6E1RxqEOAz7K7h7p9+x/sM+P2cWfDa1Ze4ymHJNZQtWo2QBFVQMFDmsmF9OndzhAjsQ1pj2ao9+lZ+YfizOqiTH+MhMpSlptuShsHrH59GbycBazYighITZtmUXI1djmE11w3Mh7XtAXL0tfjggRGvFkZDvbQsNO2MNpIsYNs/qwph2uGDD92pg3jBb3A68bWPclYsu2ekTQw536IQjqGNjwkP1pnGEl/k/ZQFeXoESggpFklVLuLF8sTORcpqx0pgfJZgwweZ0plFC6UHxzW8IkR/Unjl1r8TxDL0sua3J02fzFqslYVrK21cJuvCCTTRbVv2Kx+b9jk/Pinjag5qEDuhfalyun/bvomQ+SJIwIbSdPEiDmYkGlCB8C5GBou9mcSmLMoIf2fMaWNOQCRrpOKTpFEgTVmACnR7RUEX1kEz+lfD3diDILL/cr3NKomBUjdYS5MTLUSbBMIK14ANCGaarrr72aT7qjgeOYD/c9lmG5a69eONQw4UeR32c4OWwvyhOLE7DFSrLLw1wxTqVy34czzFZ5PYYAmhJiDTPCUub39v0uy3absIDN15569hkrDgzwe4hJ3cfrps9FXN+WMPhFsYuKVoidU+/CYcDyFpwlttycOdzrvVFWagdwtJWgIpz3I2r9pf9tO0AbuIfAMomPS30pr8Iu7DscTS9/7uDWzZF9RUZ2F/JTl15KR+mGgd8y3W/PsGChc29ZcKmMqKzgcZNry3peaaKyVnkaG4vXagpal6u3Bd3kC2NKd8s8xGpbEnH6fEOOATs3IiqQ35PjP6dxIUQ3Kg6vMOuvCz5tTl7j+hgpctGzEVRCRiAS6Bi/0qu+ihrQKo83w5wp5tUXeHwalvMh5B6Y4aNRP4+WTQ2+2p57T4BzXK2ARauiW+P5b+8EZMX0fjqpL7Jn+BVJ6Df/n/Nu/ll3YxT3j97OtDHNFm9l63Kuhw8GFObg= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 111f99b8-6ff0-42c7-b8a5-08dbe7cd99f4 X-MS-Exchange-CrossTenant-AuthSource: AM0PR10MB3586.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Nov 2023 00:30:46.7895 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR10MB3837 Received-SPF: pass client-ip=2a01:111:f400:7eaf::802; envelope-from=m.kalandyk@outlook.com; helo=EUR03-AM7-obe.outbound.protection.outlook.com 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, FREEMAIL_FROM=0.001, 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 Change-Id: Iebe76c75d45e70317bd18d2c176dcdeaf9d6964c Signed-off-by: Maciej Kalandyk --- guix/scripts/locate.scm | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) base-commit: a0d337e79c87d7c38c79d0291974f490cb137a52 diff --git a/guix/scripts/locate.scm b/guix/scripts/locate.scm index ae64f46896..c24e969be7 100644 --- a/guix/scripts/locate.scm +++ b/guix/scripts/locate.scm @@ -115,13 +115,21 @@ (define schema-to-migrate '((1 . " "))) (define (call-with-database file proc) - (let ((db (sqlite-open file))) - (dynamic-wind - (lambda () #t) - (lambda () - (ensure-latest-database-schema db) - (proc db)) - (lambda () (sqlite-close db))))) + (catch 'sqlite-error + (lambda () + (let ((db (sqlite-open file))) + (dynamic-wind + (lambda () #t) + (lambda () + (ensure-latest-database-schema db) + (proc db)) + (lambda () (sqlite-close db))))) + (lambda (key . args) + (match args + [(_ 5 _) + (leave (G_ "database ~a is locked by another process~%") + file)] + [_ (apply throw (cons key args))])))) (define (ensure-latest-database-schema db) "Ensure DB follows the latest known version of the schema."