bug#66799: closed ([PATCH] Fix guix locate clear database "no files to search for" error and unnesecary database rebuilding)

[GNU bug Tracking System]

Your message dated Wed, 15 Nov 2023 18:36:28 +0100
with message-id <87msve7wbn.fsf@gnu.org>
and subject line Re: [bug#66799] [PATCH] Fix guix locate clear database "no 
files to search for" error and unnesecary database rebuilding
has caused the debbugs.gnu.org bug report #66799,
regarding [PATCH] Fix guix locate clear database "no files to search for" error 
and unnesecary database rebuilding
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
66799: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=66799
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
> --- Begin Message ---
>
>
>
> 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
>
>
>
>
> 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 <m.kalandyk@outlook.com>
> ---
>  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
>
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: [bug#66799] [PATCH] Fix guix locate clear database "no files to search for" error and unnesecary database rebuilding
>
>
>
>
> Date: 
>
> Wed, 15 Nov 2023 18:36:28 +0100
>
>
>
>
> User-agent: 
>
> Gnus/5.13 (Gnus v5.13)
>
>
>
>
> Hi Maciej,
>
> Maciej Kalandyk <m.kalandyk@outlook.com> 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 <m.kalandyk@outlook.com>
>
> I fixed it slightly differently in
> 69d9a020949c77c77b449c1faf04397b95eef5b7 and added a test in
> ‘tests/guix-locate.sh’ so this bug doesn’t come to haunt us again.
>
> Thank you!
>
> Ludo’.
>
>
> --- End Message ---