From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 28 13:49:25 2023 Received: (at submit) by debbugs.gnu.org; 28 Oct 2023 17:49:25 +0000 Received: from localhost ([127.0.0.1]:39504 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qwnR6-0004Fj-Lr for submit@debbugs.gnu.org; Sat, 28 Oct 2023 13:49:25 -0400 Received: from lists.gnu.org ([2001:470:142::17]:52596) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qwnR0-0004F2-LS for submit@debbugs.gnu.org; Sat, 28 Oct 2023 13:49:22 -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 1qwnQN-0006JF-Hk for guix-patches@gnu.org; Sat, 28 Oct 2023 13:48:39 -0400 Received: from mail-db3eur04olkn081a.outbound.protection.outlook.com ([2a01:111:f400:fe0c::81a] helo=EUR04-DB3-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 1qwnQL-0002pD-FQ for guix-patches@gnu.org; Sat, 28 Oct 2023 13:48:39 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LuNMwFR6f27nvTIShOVDME3/narlUdZ4TY0/qKxkXf2ov91NVv+VDKdd50L8dzoIvj9YzmccfRAZ2H9yu/8HAIGYP3k9BsjznKKPzcf5n3sXEdqy4hi+MaBj74vbwj8iJbXcekmDuvWk4TZN/P0+YZkVOF7qKO0MXmkVNsMP4LEMWaQ0hXblCyebkFMY1m+/zGEoeNu293thTUBcbw0GlLUut5YwpBgSo6/FnZ8o2rIF6STFjwbIRyH6ERD2wBIP7yDIiZ0kiSmfBP6FtcOLj9GM9Ngs/bAPd00W2LHEEktahuELrqtVn8jFf9wzxXfyP02BAhmTre1SOFRbogj0vw== 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=foMjcWbgOpDlk9pt2DWb2XJaH5W6Lj4dBh1nLxMM2l4=; b=lnGD38zyiqFabun8XsimfZcG2RIHovcdHOCakXk52TAZIXQjzQ6eSkaUMlwSZv5TLxKyU/D8UfDaVX7qi0TmtZKYC2sS2qWLBzoMM5mUYgOs/wUrw70QKHwFs0qNbgWMs8DAmAWBsEaP7BEkqx4g9XhKOPYXJnQLIM1+6VEN7h4GgGXrLuM4siNLYNAFw8aKnq6wb+QbNDqFU+IRAsTKgSgAJ2Yxqa/H0rpXcbEfoMF7I6fLZQc6KUrHn6KMoKuqgnyb/kPjQc0nbGD1IoNVb+09xTIcXIhUTKH5GdOEXI6QoMIhshvgyPZvmFI17350NWTQpxnyeIzK61LdXUrnyg== 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=foMjcWbgOpDlk9pt2DWb2XJaH5W6Lj4dBh1nLxMM2l4=; b=c4v3uJKkFZKwH02zh0+ZnjVJEp/k/HZEcR92zZB/czn1AsKq1n+rNWUgc2k5xktoVvxZSMBdXybSuiGVsjlhV4v9Gg3kS/VLzQS43fM7DyfgBjjsBVUOrSbNcjjlBeZ5QxOLSieiG28ju+T7m0M8W6Wd8wP9UNX3XmH99OkA6S/KycojUxDQJjNMmmLFvU2P9riDsf9utuGJlCfnyInv67QWZ+6J+opOENBpvrGPXy3nY7fQSNUHObkrQNkE28/pGSFwInBTdoGvH7tPZcvVJsZUOH9wu6Bwv2wxPj5QWmi75JludE4M8+vrhU20c5JZiHrBesL7yq5dE4XGM5xVgA== Received: from AM0PR10MB3586.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:157::23) by AS4PR10MB6205.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:589::17) 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:43:33 +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.6933.025; Sat, 28 Oct 2023 17:43:33 +0000 From: Maciej Kalandyk To: guix-patches@gnu.org Subject: [PATCH] Fix guix locate clear database "no files to search for" error and unnesecary database rebuilding Date: Sat, 28 Oct 2023 19:43:25 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 X-Debbugs-Cc: Christopher Baines , Josselin Poiret , Ludovic Courtès , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Content-Transfer-Encoding: 8bit Content-Type: text/plain X-TMN: [dmLazeLChlKLac+Skp8wm8ClAE8NFPCe] X-ClientProxiedBy: FR5P281CA0057.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f0::15) To AM0PR10MB3586.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:157::23) X-Microsoft-Original-Message-ID: <835dd70c2e3e945c8dcca74f5d4d7cd33066b414.1698514844.git.m.kalandyk@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM0PR10MB3586:EE_|AS4PR10MB6205:EE_ X-MS-Office365-Filtering-Correlation-Id: e1f7a69c-c80d-4f4d-210e-08dbd7dd6653 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mRg+iwky8wJyJxHXCT4PrzVdTvDxjzRzKc92SfKT86ojSmSbmD5GXlilOc6AkUN6UFZ2+j/265sAZyUbG920pS8XbqtS/vax7maBX/UVNxTaM0P7hh8jMzxRVVLybm8QoXEIBaN90zSYV79tZw9HCiPH3J2kRICOekryHqW84lOniPF5pfcw/ApFGR2D2qpuxoqp59XiGEGO7ys0YZts6lUNuJEwDEsi8KeEXtTMFGUMqQF03kYBzIdlcwtesBYxcaqLfVbFlN3LAP8CWJ+uOlFTDcOWghaUY8DLKCLj5JFO4hJhk5dnXkkAO5qwaPNWWHoW4sahtToiujQqsj+VuW13FxHUAzB8d3wpiPZWBd+i2P1nj0yg/vC5mcvhTUgc4EDQ0rS5/GkwhGZ+NUkLINgeIF46C35aGV7qG9r6krKek/IsC0FjDO+t/IpzP0D4AaX+aZKHGxT9NnDhVLRpB4nnxLSiAaX+1ltFl2bv+cyrQ5p6ubq6Wj6YmXl4VTmNk4iuOkSj/isEL4Miq9NG+ny4sipFrof6yIyFEUtzU7bWAQJ1QEmnQtEAvi8UJD+Fd6IDGei2hIhf8qsgJX0zHi0V5EIDZ4m3i8W6abGMzj2oQ2OIHt29LEFAzQfJHgxe X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?xWZxTKdnbQGh9RJ90KMLY8ux6qzC28jGMrP+lOvTdUopJ3AbefzkzOtvtYZ3?= =?us-ascii?Q?3gku1uRx6QQbXGMUFvPkkFknYgNps708ZPJzT6avWLSBcpsdnZewH/yQIJz8?= =?us-ascii?Q?OAKUpIPkkecpZtG67FAhfOTjdKqaV9qYjb6zalRDRSZLCxIZOeh4qQUeDjr0?= =?us-ascii?Q?bTI/v8O4TE8mozSPdho/gAcZGJB9bndldLmANo64TmAC8438ecpKMK3RhQ1u?= =?us-ascii?Q?010o9Reu4hZp/OUWZLskGOPzrOZsnqxCqQB5b7VqUuZG/EGYLj/QxRHl7EyJ?= =?us-ascii?Q?UongNhDMtJ4HOEZ/uH9L/A3HIZ8TI43o2hURKazrYo/HwRjug6v/l6SPmxYR?= =?us-ascii?Q?z6H5gyVWkyEIr/zqLAapobpdwcso5raRWJGm+lWssQaSyeG2iKDzK0ui1BYx?= =?us-ascii?Q?h96MZmOGFbclVkujRpFFe/w9t4zujRgI2Akn91KzvK9RsijsrCGjr+AWcd+6?= =?us-ascii?Q?5ye2p9nWEiYrwWxY4jdqC/Mlh/XqHXIcmkGTgBkYmgBPtDbA8IcNWhyiq1S1?= =?us-ascii?Q?rdryLde88Q7quIrm+OYV479eDXVBz2XqEy/XZ9WTljNsvK81q5Hf2VCi3Rk8?= =?us-ascii?Q?CrDl9Id08qXW2eJqH/gtooSyETD7p4gUmdrWRAGfuCfsZ8rcAz7+B1iNglwi?= =?us-ascii?Q?dYtkhr9C5MjHDNtirukpbFRGNxvAcpVvCPPIoWsiaBvAVTV2LvDQUpI5EaOv?= =?us-ascii?Q?Hb7uorX2brI0zu1EzgbF8P/20jRtjTmxrD5LO2HfIfGSERqW/AuW6nqauVn8?= =?us-ascii?Q?3pNPoak5qkqBw5chX0j3vJwRgsmnSaZdHj8MRIF6Rdvk2UVY8V7Pv6HJI8g2?= =?us-ascii?Q?J0uqnaAJYaNa1Hf42+fdblB5aMe9IYRfb65MsbyIZOKH+5Q0umimXL3TWsvb?= =?us-ascii?Q?3xSPhBAzeDdJNZAW860HkA4YnH4uHrXfTExJ51AMUoniIL9y5L7136nV+Gq9?= =?us-ascii?Q?ilPtbterrzzZhuvp21aqE6R1egYZpINPEqweS9lX850bCgmLxLPosxQCjmVE?= =?us-ascii?Q?T0oftZ0gicDATKW6wE6nkmNHADrg89bGUwrBUe1P7qp84ShjVU8LfZNEw7mA?= =?us-ascii?Q?HIic1laU1+TuXgfOovjmzqzzCne+aBPu871P9ChiGHAJgfFeG+qlLn5k3rAr?= =?us-ascii?Q?unVccj7WroinNsSBwE8DkJwBI+tOmBASoHAMsa5Q0vsCOI5TneTFJhi5aVnn?= =?us-ascii?Q?fdqujFhMDwNBcYCpW5dd1896YA1cPuGf2DDPeA=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e1f7a69c-c80d-4f4d-210e-08dbd7dd6653 X-MS-Exchange-CrossTenant-AuthSource: AM0PR10MB3586.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Oct 2023 17:43:33.2586 (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: AS4PR10MB6205 Received-SPF: pass client-ip=2a01:111:f400:fe0c::81a; envelope-from=m.kalandyk@outlook.com; helo=EUR04-DB3-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 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 3.0 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: This patch fixes error with guix locate --clear that causes it to display error when no files are supplied Change-Id: I0e9ca223d6406c78b0dd8ff93976c3077d89e103 Signed-off-by: Maciej Kalandyk --- guix/scripts/locate.scm | 29 +++++++++++++++ 1 file changed, 15 insertions(+), 14 deletions(-) Content analysis details: (3.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (m.kalandyk[at]outlook.com) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 2.0 SPOOFED_FREEMAIL No description available. X-Debbugs-Envelope-To: submit Cc: Maciej Kalandyk X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) This patch fixes error with guix locate --clear that causes it to display error when no files are supplied Change-Id: I0e9ca223d6406c78b0dd8ff93976c3077d89e103 Signed-off-by: Maciej Kalandyk --- guix/scripts/locate.scm | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/guix/scripts/locate.scm b/guix/scripts/locate.scm index ae64f46896..93faa1aea2 100644 --- a/guix/scripts/locate.scm +++ b/guix/scripts/locate.scm @@ -634,6 +634,9 @@ (define-command (guix-locate . args) (_ (leave (G_ "~a: unknown indexing method~%") method)))))) + (if (and (null? files) (not (or update? clear?))) + (leave (G_ "no files to search for~%"))) + ;; Populate the database if needed. (let* ((stat (stat database #f)) (age (and stat (file-age stat))) @@ -649,20 +652,18 @@ (define-command (guix-locate . args) (if (assoc-ref opts 'stats?) (print-statistics database) - (match (call-with-database database - (lambda (db) - (append-map (lambda (file) - (matching-packages db file - #:glob? glob?)) - files))) - (() - (if (null? files) - (unless update? - (leave (G_ "no files to search for~%"))) + (unless (null? files) + (match (call-with-database database + (lambda (db) + (append-map (lambda (file) + (matching-packages db file + #:glob? glob?)) + files))) + (() (leave (N_ "file~{ '~a'~} not found in database '~a'~%" "files~{ '~a'~} not found in database '~a'~%" (length files)) - files database))) - (matches - (leave-on-EPIPE - (print-matching-results matches)))))))) + files database)) + (matches + (leave-on-EPIPE + (print-matching-results matches))))))))) base-commit: 6d7e181ba18d11c92409a93936025fb46b9c8171 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 15 12:36:53 2023 Received: (at 66799-done) by debbugs.gnu.org; 15 Nov 2023 17:36:53 +0000 Received: from localhost ([127.0.0.1]:53668 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3Jor-0001MV-7i for submit@debbugs.gnu.org; Wed, 15 Nov 2023 12:36:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43010) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3Jom-0001MF-GB for 66799-done@debbugs.gnu.org; Wed, 15 Nov 2023 12:36:52 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r3Joe-0001qV-S3; Wed, 15 Nov 2023 12:36:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=W/3n5NVpCuKlzQUv/1OgOnonpXnOatcFTsZycZvZViY=; b=qOQ9Rj7vD/fzDfNftXDF 1PXNY+hasOm3EubJrC07Tjza7jaeV3Nya71Drc/xidhBlsOcoLUAXIRM9QB0uc6AtIcqMTvFqu2VC XTl0AqS4uUOlknUXBqIb5QD1sxsiCLaIir5adUcK64KsSYNbd7kFUCUA8OLluwliHuHd2gcUyvmi+ riDc4Huu4ckouaB8FgADeFy8nlnYc65o1Gt5il+CZzhLGCl3nbMIQ3HadbNlKjs1hkY8lKr6PMgY7 AbnIQ9K4ZIj230mNJm26EtmjJdM0t54OSNe1AWO3pyfGhnJZZ5IJjVyvTtQoJFjp0cA2izGcxFhWO 7p6Cv2fNn7SUwQ==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Maciej Kalandyk Subject: Re: [bug#66799] [PATCH] Fix guix locate clear database "no files to search for" error and unnesecary database rebuilding In-Reply-To: (Maciej Kalandyk's message of "Sat, 28 Oct 2023 19:43:25 +0200") References: Date: Wed, 15 Nov 2023 18:36:28 +0100 Message-ID: <87msve7wbn.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 66799-done Cc: Josselin Poiret , Simon Tournier , Mathieu Othacehe , Tobias Geerinckx-Rice , Ricardo Wurmus , 66799-done@debbugs.gnu.org, Christopher Baines X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Maciej, Maciej Kalandyk skribis: > This patch fixes error with guix locate --clear that causes it to display= error when no files are supplied > > Change-Id: I0e9ca223d6406c78b0dd8ff93976c3077d89e103 > Signed-off-by: Maciej Kalandyk I fixed it slightly differently in 69d9a020949c77c77b449c1faf04397b95eef5b7 and added a test in =E2=80=98tests/guix-locate.sh=E2=80=99 so this bug doesn=E2=80=99t come to = haunt us again. Thank you! Ludo=E2=80=99. From unknown Sat Sep 20 08:01:19 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 14 Dec 2023 12:24:18 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator