From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id KEpbD9FJPWUqIAAAauVa8A:P1 (envelope-from ) for ; Sat, 28 Oct 2023 19:50:09 +0200 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id KEpbD9FJPWUqIAAAauVa8A (envelope-from ) for ; Sat, 28 Oct 2023 19:50:09 +0200 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 839A346E5B for ; Sat, 28 Oct 2023 19:50:08 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=outlook.com header.s=selector1 header.b=PWLPWNTF; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}"); dmarc=fail reason="SPF not aligned (relaxed)" header.from=outlook.com (policy=none) ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1698515409; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: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=SfXUAKVkIAMCtS/kTmglPBbbU12lJYClniZ26Ndrn3U=; b=Mj1L87l9T1fAZqNuXikjv223X1jg+QkzqvE6NaKVNMjYpJvLvh7x/rcexqkm94cXXtT1mC 5b6hnqKI3ugWTN33q0XppHf5plNiWuzY1lIk1DSQi+fXla5isj6iKXh45+o/HwIhodeuUJ UqLAH9ccIo8JqMI141JhU0rdKbFScIiQhQqt5CYoVp7JtGH7wgs0T1PhkOXQsH57VdMPnO DeD/RW7xHpsCnxrAhREm9xS6+YIqk8ooXavydqQVo5Eu6Ekx80kW3OnqjngxpxpCkhcFbd w3qh3ugnAICQihM0YMyO8qem3AhSW3svpW6OFxSkjN8hzMBHd/quGvH2KYHAdg== ARC-Authentication-Results: i=2; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=outlook.com header.s=selector1 header.b=PWLPWNTF; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}"); dmarc=fail reason="SPF not aligned (relaxed)" header.from=outlook.com (policy=none) ARC-Seal: i=2; s=key1; d=yhetil.org; t=1698515409; a=rsa-sha256; cv=fail; b=idTh816wgoUgKoLhReRBgEZBH9fTz+81GDU5ZbGb3bsJruk7CB/eFFDsFP/7wql1wbYfBR qKiY94WIBrNquss/s/xIGkGPlRjd2LH9W0FqSUmkxp54GNOB9MxZ8ONm3vxbIXyXQelUd1 MI0ojuwaFRN7T6ZGkmjyDoyA+9GYYLrCQM3ndJnyJb4orF71o2unkiAtcNdKdobNYQrYMK qTWhgByPXdHlMyXJpdAf20hUjjovHw8/Lb979ChISKPkI7wqY4DIK53sn8iITHayU9QBPG v8+JSHFOqiCtxulEZYetYbVAJQjAEIY2tVBSNM/btGhmyh8iwqDYwCGB/q/IOQ== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qwn32-0001C6-K1; Sat, 28 Oct 2023 13:24:32 -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 1qwn30-0001Bf-Jn for bug-guix@gnu.org; Sat, 28 Oct 2023 13:24:30 -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 1qwn30-0007i3-8L for bug-guix@gnu.org; Sat, 28 Oct 2023 13:24:30 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qwn3V-0003ao-TO for bug-guix@gnu.org; Sat, 28 Oct 2023 13:25:01 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#66754: [PATCH] add guix locate database is locked error message References: In-Reply-To: Resent-From: Maciej Kalandyk Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sat, 28 Oct 2023 17:25:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66754 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 66754@debbugs.gnu.org Received: via spool by 66754-submit@debbugs.gnu.org id=B66754.169851387913778 (code B ref 66754); Sat, 28 Oct 2023 17:25:01 +0000 Received: (at 66754) by debbugs.gnu.org; 28 Oct 2023 17:24:39 +0000 Received: from localhost ([127.0.0.1]:39490 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qwn38-0003a9-Le for submit@debbugs.gnu.org; Sat, 28 Oct 2023 13:24:38 -0400 Received: from mail-db8eur05olkn2035.outbound.protection.outlook.com ([40.92.89.35]:52383 helo=EUR05-DB8-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qwn36-0003Zu-Hx for 66754@debbugs.gnu.org; Sat, 28 Oct 2023 13:24:37 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=U6PCn+AgFyld26oInuJm7yX2uOr6GTlOnT022jfqNQbTFDfU1e7paIPYhxqP2JCPUjL3tV1S0dleoMMTX0bAmjb+Tb4aBFA7wzWFpjVyd2INfbP7oMC3mG6oykHVkZGVp7PaD4FfpJLu2ki/6sAzYRRiwx32EreAfARUDwCqyow/a+wdudFGHkBPRZ6GsdLoKI6mudggJJt3+zR2tSqwXqqKOwkn/CoKg353DWqJD3UPnuKBz0V/PXzTN/pGfsqJ71VgZwJOZ58wHDcLK1Up6hfueit/BF9QKw0T6PUrrvmbRkDS6pkOUiv6guiHdwcUOpawL4zvs01vFmzwJL+UnQ== 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=SfXUAKVkIAMCtS/kTmglPBbbU12lJYClniZ26Ndrn3U=; b=VEKxooGgTWGqH3o9RVFidfRO+6Qs0jO95CjWnpmPvCiH0djTArHAkd6qRC3Jcsvd0ZdFjxsd0UWoziIU3lz5jPUrykA5vh16J8a9RKsALCwHsCB7JMkVhmVdk/MA6eNOrbBf/JZr5Foe2Q4asfTuegfB0tLEE7BY+E5U/f+Cao2wsti3fUbLe4cwP9/mphH3TdjAMsI2cyWm77SMsj1JwYLwp940QZjQxm+QpSKjk7xgKJoUnBb8xTg0jmVCj5PEQV8xmrGDJ2VXM+9CGxvE2njD8IyNKA2iFBff5bm2GX0gmN+8pvc5RwO0s8TKPLqURI7WNSRnTK3wNoD4d0ObCg== 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=SfXUAKVkIAMCtS/kTmglPBbbU12lJYClniZ26Ndrn3U=; b=PWLPWNTFXGpILiV8kN/RoJA0C8MoCXatetpTEV4XLEoqRbxdpjrw4HFKnOBf4zVd7/8lNWjsK9PvIsKQ+Ye5aCADxhBf3uTSzVMuHSa1Hl609c/TCDUBufh+pxG1oD2GZ+7EAAZve1lg8iDwGqoCsd5fcQNCy4PY2ueHHJO5eQVG8MzYsUdstXXgeQRTtqLOfGHm1HIqHCll2iqwPMNKMzKAou+xrCbNB30vYU7iKtsPvsdfsDjb/OCeZD+IZjZvRlyuFD0D8mDGUaJ2e0ONUggs62LGD/4DAy7SrQbJ7NgmSx0Pj/vhR4wu+hLq07sPW0ddeeKHtF9bUOhTyMtQiA== Received: from AM7PR10MB3591.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:13e::21) by DB9PR10MB7627.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:33a::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.25; Sat, 28 Oct 2023 17:23:57 +0000 Received: from AM7PR10MB3591.EURPRD10.PROD.OUTLOOK.COM ([fe80::5cfd:5495:bdad:8f28]) by AM7PR10MB3591.EURPRD10.PROD.OUTLOOK.COM ([fe80::5cfd:5495:bdad:8f28%4]) with mapi id 15.20.6933.025; Sat, 28 Oct 2023 17:23:57 +0000 From: Maciej Kalandyk Message-ID: Date: Sat, 28 Oct 2023 19:11:09 +0200 Content-Type: text/plain X-TMN: [jLXz/iS/nxsewh6u0rNAqhmhBo5FKKwe] X-ClientProxiedBy: WA0P291CA0005.POLP291.PROD.OUTLOOK.COM (2603:10a6:1d0:1::13) To AM7PR10MB3591.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:13e::21) X-Microsoft-Original-Message-ID: <87h6maek44.fsf@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM7PR10MB3591:EE_|DB9PR10MB7627:EE_ X-MS-Office365-Filtering-Correlation-Id: a1ff090b-a3fc-4a97-0274-08dbd7daaab0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 70+9mSdJuNI7Q1qwvye+uul+VhRWlneXIudiE99gcv2QLGAvIGth7CdWAmBXiuLepHCgxq6WwY4ahwU9bY7YSMewZ58WNLSFR+c2Lxs1e8Xq10v/1FLLqEaccU92UO3L24ZonTdNV9n8pYuf7KhsxDAcDS2WhtfKlqUrXrBElH9u0ZDv27HHHt/SUD8NhSDSUuv8hDnZsHeegci1qbsME79IrPmHTszNm6dpnNPzJDe8BzxjWkkFq5AYJRP1F/InJjD+Vzjx3i8+WR0FTGWbqgq9YcMEBXJHbRTn4UWFWAQxPdeaK4UghuM6KLynRFPO/tasbiR7BqmFHXC2xzWrn18m8lar/XHBydjwm+9jBsWv/Oyzp2t9x1RaeBHoJNqXb56VLJRoMzfWqEN/fwm/rIDZf4V5TJxLtoqhvL/l6Ocu0FVP4lj5jlvwVHpXYzvbSjHJGKx2LPopSWWT/MJmrw0TX2fAvQ9xCemZ028rdIGzhk8S2WyqSfwOLePBP8cYLfd25fSX/41iyBLeLe/n3R+PXkpeWNYcdztFbLNk2XScdqBG4/lUDgNJh70a6U3U X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: IMiLPo4APTJqMjbvE125d3NwHRmDN8h0cux7dY0IhUEn10zfz+OoEGTsGvYw3SOXc6FFkLbx7yNvUOCOVQ84wYOYOvo/Sgo9uZoPR2tOQY244dwe1qOT+4Rl50DD//FlRVlB47ddRaIVx0QTK75gC2VA98AbKe8IA1mH5Xdhc6OxuP3PG8HKpGs/Tvf2jHTV2nzzWpxvVL6FrCh0z+qTH6PtZPajxHXcC9nXmE3HczJH0vYBc67V81G6VNqWJQ3u0oESN5/aQ5VpdI1KzDMhOM4RPTpXqDr80TFhj0ix0nd+gxEtC48BKjqybyoIBsLP4FjfVMILlYVr3u89mJBBTkoVK0SpTBAM4e0tpDp2G5fF8M6o5I5IXf9ExEtYP3uV8BpW8iUnvowDQbs8urxpiEp7vPGwYoJtzBMzXtjx6al59yDUQk6v94GtJAdk+TBIjuM95NEaDdAobTaucDO1rDEjnr0ls9BZRdcvVeZVt+YUlxh/UZKnQaLKshomxPsMkJ9QpL+DpzSWv41aztOXdNynpZ0Xsh81TCF1r/8/VS+UfEi5WCVRdBFvoVxSfnBPGyOzqlYkXvRGjlh/nJvVAgIriNK+OAE51ZR9FJ/vY3Pt24lGM8kVbA6hxcoZtQBgdkl/eZod+FYUb1CEwRFBRFU8Gsz/eYKyAlalprMDWQlYYnrGG9slXo2zStVC8k8RairLYEPHD15FEwrFr54+8SX11eIJUvRRH6eK7NOvdrWq0lwI6t25tWdxo9mYKaWxtx3ZJGk2lGdjoKspjK66CmVu2o3sIWQUFkHvOe2iwG3pg+nIuvWLtp/qv3VA9sdELF5+wtdS8sJ0XlnbOZZ57aSJGa+ratfiYp81GnLP1UrtMP2EAIKoHUWhBFJn6Xzzevby1GhAqw91o+G8ULec8ACbwXPXYDwMvWxeWRAYYh/fAHvjp3v0yt7b/nuJQ3+2 VSPi21hI1lyT0s4txTyxNllkW4reu49xVc9i6O9yypuk5mon5B0Xdtz+ESzKYsxBb0sYc89/qhKXkbaOYL8gBMDrs4yPJGcSG7iDWoBDjiK0pVmW/fI8rwFBdFp+cy3eZoLc8q9Rgr0MMgp9U5HqSaulOxoP8zk/zFLFk48698e9ummv3XmMUkq3iPWHdPM0fAIXE6Uj3u8CgPUw0Di9a4Hq10GbAr/XiWAScXShgfJIbOThXLoyJR7LqdEGnYTHcMyZAjkfuCOprsMI+xHNUg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a1ff090b-a3fc-4a97-0274-08dbd7daaab0 X-MS-Exchange-CrossTenant-AuthSource: AM7PR10MB3591.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Oct 2023 17:23:57.7131 (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: DB9PR10MB7627 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: 4.90 X-Spam-Score: 4.90 X-Migadu-Queue-Id: 839A346E5B X-Migadu-Scanner: mx13.migadu.com X-TUID: Pp1Sx0dRY+Oo Change-Id: Iebe76c75d45e70317bd18d2c176dcdeaf9d6964c Signed-off-by: Maciej Kalandyk --- guix/scripts/locate.scm | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/guix/scripts/locate.scm b/guix/scripts/locate.scm index 93faa1aea2..a6b6036052 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." base-commit: 6d7e181ba18d11c92409a93936025fb46b9c8171 prerequisite-patch-id: 9ba8ba9723e24b3d15f07622ff1c5ae78567f6cd -- 2.41.0