GNU bug report logs - #77037
[PATCH] services: `file-database-mcron-jobs' search updatedb in package field

Previous Next

To reply to this bug, email your comments to 77037 AT debbugs.gnu.org.
There is no need to reopen the bug first.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Sergio Pastor Pérez <sergio.pastorperez <at> gmail.com>
To: guix-patches <at> gnu.org
Cc: Sergio Pastor Pérez <sergio.pastorperez <at> gmail.com>
Subject: [PATCH] services: `file-database-mcron-jobs' search updatedb in
 package field
Date: Sat, 15 Mar 2025 15:18:30 +0100

`file-database-service-type' appends 'bin/updatedb' path to the `package'
field provided by `file-database-configuration'. This prevents users from
using alternate packages which also provide 'updatedb' but in a different
location.

For example, the `plocate' package installs 'updatedb' it in 'sbin/updatedb'.

Use `find-files' to locate the binary within the user configured package.

* gnu/services/admin.scm (file-database-mcron-jobs): locate 'updatedb' binary.

Change-Id: Id35b26cbe41261a0ac3add53757d240b003aa26e
---
 gnu/services/admin.scm | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/gnu/services/admin.scm b/gnu/services/admin.scm
index 2a11a4f4f10..19b0d64f2c2 100644
--- a/gnu/services/admin.scm
+++ b/gnu/services/admin.scm
@@ -37,13 +37,16 @@ (define-module (gnu services admin)
   #:use-module (gnu services shepherd)
   #:use-module (gnu system accounts)
   #:use-module ((gnu system shadow) #:select (account-service-type))
-  #:use-module ((guix store) #:select (%store-prefix))
+  #:use-module ((guix store) #:select (%store-prefix
+                                       open-connection))
   #:use-module (guix deprecation)
   #:use-module (guix gexp)
   #:use-module (guix modules)
   #:use-module (guix packages)
   #:use-module (guix records)
+  #:use-module (guix build utils)
   #:use-module (srfi srfi-1)
+  #:use-module (srfi srfi-26)
   #:use-module (ice-9 match)
   #:use-module (ice-9 vlist)
   #:export (log-rotation-configuration
@@ -473,17 +476,21 @@ (define (file-database-mcron-jobs configuration)
                      #~(begin
                          ;; 'updatedb' is a shell script that expects various
                          ;; commands in $PATH.
-                         (setenv "PATH"
-                                 (string-append #$package "/bin:"
-                                                #$(canonical-package coreutils)
-                                                "/bin:"
-                                                #$(canonical-package sed)
-                                                "/bin"))
-                         (execl #$(file-append package "/bin/updatedb")
-                                "updatedb"
-                                #$(string-append "--prunepaths="
-                                                 (string-join
-                                                  excluded-directories)))))))
+                         (let ((updatedb-bin #$(find (cut executable-file? <>)
+                                                     (find-files (package-output (open-connection)
+                                                                                 package)
+                                                                 "^updatedb$"))))
+                           (setenv "PATH"
+                                   (string-append (dirname updatedb-bin) ":"
+                                                  #$(canonical-package coreutils)
+                                                  "/bin:"
+                                                  #$(canonical-package sed)
+                                                  "/bin"))
+                           (execl updatedb-bin
+                                  "updatedb"
+                                  #$(string-append "--prunepaths="
+                                                   (string-join
+                                                    excluded-directories))))))))
       (list #~(job #$schedule #$updatedb)))))
 
 (define file-database-service-type

base-commit: 412f411d4f8780e6b60b448caae17f01c09be0eb
-- 
2.48.1

Message #8 received at 77037 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Sergio Pastor Pérez <sergio.pastorperez <at> gmail.com>
Cc: 77037 <at> debbugs.gnu.org
Subject: Re: [bug#77037] [PATCH] services: `file-database-mcron-jobs' search
 updatedb in package field
Date: Sat, 15 Mar 2025 22:35:10 +0100

Hello,

Sergio Pastor Pérez <sergio.pastorperez <at> gmail.com> skribis:

> `file-database-service-type' appends 'bin/updatedb' path to the `package'
> field provided by `file-database-configuration'. This prevents users from
> using alternate packages which also provide 'updatedb' but in a different
> location.
>
> For example, the `plocate' package installs 'updatedb' it in 'sbin/updatedb'.

I didn’t know about ‘plocate’.  :-)

Could yoiu add a line in the doc explicitly mentioning that ‘plocate’ is
supported, in addition to Findutils?

> +                         (let ((updatedb-bin #$(find (cut executable-file? <>)
> +                                                     (find-files (package-output (open-connection)
> +                                                                                 package)
> +                                                                 "^updatedb$"))))

This wouldn’t work for instance if ‘package’ hasn’t been built yet, and
also, it opens an extra connection to the daemon, which should be
avoided.

Instead, I’d write something like:

  (define updatedb
    (let ((try (lambda (file)
                 (and (file-exists? file) file))))
      (or (try #$(file-append package "/bin/updatedb"))
          (try #$(file-append package "/sbin/updatedb")))))

Could you send an updated patch?

Thanks,
Ludo’.

Message #11 received at 77037 <at> debbugs.gnu.org (full text, mbox):

From: Sergio Pastor Pérez <sergio.pastorperez <at> gmail.com>
To: 77037 <at> debbugs.gnu.org
Cc: Sergio Pastor Pérez <sergio.pastorperez <at> gmail.com>
Subject: [PATCH v2] services: `file-database-mcron-jobs' search updatedb in
 package field
Date: Thu, 27 Mar 2025 23:36:52 +0100

`file-database-service-type' appends 'bin/updatedb' path to the `package'
field provided by `file-database-configuration'. This prevents users from
using alternate packages which also provide 'updatedb' but in a different
location.

For example, the `plocate' package installs 'updatedb' in 'sbin/updatedb'.

Fallback to 'sbin/' if 'updatedb' is not found in 'bin/'.

* gnu/services/admin.scm (file-database-mcron-jobs): locate 'updatedb' binary.

Change-Id: Ic741716044be3a8f51a157510f9f923bd66c41d7
---
 gnu/services/admin.scm | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/gnu/services/admin.scm b/gnu/services/admin.scm
index e4737940438..0eb38555951 100644
--- a/gnu/services/admin.scm
+++ b/gnu/services/admin.scm
@@ -448,8 +448,8 @@ (define-configuration/no-serialization file-database-configuration
                  (if target
                      findutils
                      (canonical-package findutils))))
-    "The GNU <at> tie{}Findutils package from which the @command{updatedb} command
-is taken.")
+    "The package from which the @command{updatedb} command is taken.
+Examples of such packages are GNU <at> tie{}Findutils and Plocate.")
   (schedule
    (string-or-gexp %default-file-database-update-schedule)
    "String or G-exp denoting an mcron schedule for the periodic
@@ -468,15 +468,20 @@ (define (file-database-shepherd-services configuration)
     (let ((updatedb (program-file
                      "updatedb"
                      #~(begin
+                         (define updatedb
+                           (let ((try (lambda (file)
+                                        (and (file-exists? file) file))))
+                             (or (try #$(file-append package "/bin/updatedb"))
+                                 (try #$(file-append package "/sbin/updatedb")))))
                          ;; 'updatedb' is a shell script that expects various
                          ;; commands in $PATH.
                          (setenv "PATH"
-                                 (string-append #$package "/bin:"
+                                 (string-append (dirname updatedb) ":"
                                                 #$(canonical-package coreutils)
                                                 "/bin:"
                                                 #$(canonical-package sed)
                                                 "/bin"))
-                         (execl #$(file-append package "/bin/updatedb")
+                         (execl updatedb
                                 "updatedb"
                                 #$(string-append "--prunepaths="
                                                  (string-join

base-commit: 71ae6f2a191e715c96b02e876f5e40e4932debd8
-- 
2.49.0

Message #14 received at 77037 <at> debbugs.gnu.org (full text, mbox):

From: Sergio Pastor Pérez <sergio.pastorperez <at> gmail.com>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 77037 <at> debbugs.gnu.org
Subject: Re: [bug#77037] [PATCH] services: `file-database-mcron-jobs' search
 updatedb in package field
Date: Thu, 27 Mar 2025 23:42:29 +0100

Hello Ludo.

Excuse my late reply, it seems your message was not delivered to my
inbox. Today I decided to check the issue and saw your reply.

I've just sent the revision of the patch with the fixes you
suggested. Thanks for taking a look!


Good night,
Sergio.

Message #19 received at 77037-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Sergio Pastor Pérez <sergio.pastorperez <at> gmail.com>
Cc: 77037-done <at> debbugs.gnu.org
Subject: Re: bug#77037: [PATCH] services: `file-database-mcron-jobs' search
 updatedb in package field
Date: Tue, 01 Apr 2025 14:00:27 +0200

Sergio Pastor Pérez <sergio.pastorperez <at> gmail.com> skribis:

> `file-database-service-type' appends 'bin/updatedb' path to the `package'
> field provided by `file-database-configuration'. This prevents users from
> using alternate packages which also provide 'updatedb' but in a different
> location.
>
> For example, the `plocate' package installs 'updatedb' in 'sbin/updatedb'.
>
> Fallback to 'sbin/' if 'updatedb' is not found in 'bin/'.
>
> * gnu/services/admin.scm (file-database-mcron-jobs): locate 'updatedb' binary.
>
> Change-Id: Ic741716044be3a8f51a157510f9f923bd66c41d7

Hi!  I update ‘doc/guix.texi’ to match the docstring you changed and
applied it.

Thanks,
Ludo’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.