01/03: gnu: dbus-service: only symlink /run/dbus the first time

[guix-commits]

lilyp pushed a commit to branch gnome-team
in repository guix.

commit 0831c72df618ef15bee719a0a2ccc123fc31837d
Author: Vivien Kraus <vivien@planete-kraus.eu>
AuthorDate: Fri Jan 5 09:56:46 2024 +0100

    gnu: dbus-service: only symlink /run/dbus the first time
    
    Due to an error in the nesting of S-Expressions, the re-linking of
    /var/run/dbus to /run/dbus would occur even if it was already a
    correct symlink.  It should only happen if the symlink is different.
    
    * gnu/services/dbus.scm (dbus-activation): Adjust accordingly.
    
    Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
---
 gnu/services/dbus.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/services/dbus.scm b/gnu/services/dbus.scm
index 1edcc6eb9e..8dee91a3f7 100644
--- a/gnu/services/dbus.scm
+++ b/gnu/services/dbus.scm
@@ -210,9 +210,9 @@ includes the @code{etc/dbus-1/system.d} directories of each 
package listed in
                           (begin
                             (rename-file (string-append "/var/run/dbus/" next)
                                          (string-append "/run/dbus/" next))
-                            (loop (readdir dir))))))))
-                      (rmdir "/var/run/dbus")
-                      (symlink "/run/dbus" "/var/run/dbus")))
+                            (loop (readdir dir)))))))
+                    (rmdir "/var/run/dbus")
+                    (symlink "/run/dbus" "/var/run/dbus"))))
                (else
                 (format (current-error-port)
                         "Failed to symlink /run/dbus to /var/run/dbus: ~s~%"