[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

03/09: locate: Accept ‘--clear’ without additional arguments.

From: guix-commits
Subject: 03/09: locate: Accept ‘--clear’ without additional arguments.
Date: Wed, 15 Nov 2023 12:33:41 -0500 (EST)

civodul pushed a commit to branch master
in repository guix.

commit 69d9a020949c77c77b449c1faf04397b95eef5b7
Author: Ludovic Courtès <>
AuthorDate: Wed Nov 15 18:12:24 2023 +0100

    locate: Accept ‘--clear’ without additional arguments.
    Fixes a bug whereby ‘guix locate --clear’ would end with the “no files
    to search for” error.
    Fixes <>.
    * guix/scripts/locate.scm (guix-locate): Do not emit “no files to search
    for” error when 'clear? is set in OPTS.
    * tests/ Test it.
    Reported-by: Maciej Kalandyk <>
    Change-Id: Ib8fa125c18481d7f5408bd89df9503713527641d
 guix/scripts/locate.scm | 2 +-
 tests/    | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/guix/scripts/locate.scm b/guix/scripts/locate.scm
index ae64f46896..92af3509bf 100644
--- a/guix/scripts/locate.scm
+++ b/guix/scripts/locate.scm
@@ -657,7 +657,7 @@ Locate FILE and return the list of packages that contain 
              (if (null? files)
-                 (unless update?
+                 (unless (or update? (assoc-ref opts 'clear?))
                    (leave (G_ "no files to search for~%")))
                  (leave (N_ "file~{ '~a'~} not found in database '~a'~%"
                             "files~{ '~a'~} not found in database '~a'~%"
diff --git a/tests/ b/tests/
index 43f8ba53b0..de0ea5769d 100755
--- a/tests/
+++ b/tests/
@@ -70,3 +70,9 @@ then
     $cmd_store guile | grep "$(guix build guile-bootstrap)/bin/guile"
     $cmd_store boot-9.scm | grep ^guile-bootstrap
+# The command below is an error: "no files to search for"...
+guix locate && false
+# ... but this one is fine.
+guix locate --clear

reply via email to

[Prev in Thread] Current Thread [Next in Thread]