Subject: bug#68259: closed (Re: [bug#68259] [PATCH gnome-team] gnu: dbus-service: only symlink /run/dbus the first time)

From: [email-masked] (GNU bug Tracking System)
Date: Sun, 07 Jan 2024 17:40:02 +0000

Your bug report

#68259: [PATCH gnome-team] gnu: dbus-service: only symlink /run/dbus the first time

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
68259: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=68259
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#68259] [PATCH gnome-team] gnu: dbus-service: only symlink /run/dbus the first time
From: Liliana Marie Prikler <[email-masked]>
To: Vivien Kraus <[email-masked]>, [email-masked]
Cc: [email-masked], [email-masked]
Date: Sun, 07 Jan 2024 18:39:07 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

Am Freitag, dem 05.01.2024 um 09:56 +0100 schrieb Vivien Kraus:
> 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.
> ---
Yeah, that LGTM.

Pushed

Subject: [PATCH gnome-team] gnu: dbus-service: only symlink /run/dbus the first time
From: Vivien Kraus <[email-masked]>
To: [email-masked]
Date: Fri, 5 Jan 2024 09:56:46 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

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.
---
 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 @@ (define (dbus-activation config)
                           (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~%"

base-commit: 1cd97066c2dc84c6e538cfa63820e18f6c12a414
-- 
2.41.0