emacs-elpa-diffs
[Top][All Lists]
Advanced

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

[elpa] externals/org 03d15dd724 2/2: org-logind-dbus-session-path: Fix C


From: ELPA Syncer
Subject: [elpa] externals/org 03d15dd724 2/2: org-logind-dbus-session-path: Fix CI tests failure
Date: Thu, 23 Mar 2023 08:59:14 -0400 (EDT)

branch: externals/org
commit 03d15dd7242536c6ee9368f6a96ec69f4a3d09f6
Author: Ihor Radchenko <yantar92@posteo.net>
Commit: Ihor Radchenko <yantar92@posteo.net>

    org-logind-dbus-session-path: Fix CI tests failure
    
    * lisp/org-clock.el (org-logind-dbus-session-path): Do not try to use
    dbus when `dbus-call-method' errs.
    
    `dbus-call-method' may throw
    Debugger entered--Lisp error: (dbus-error 
"org.freedesktop.login1.NoSessionForPID" "PID 7361 does not belong to any known 
session")
    Do not try to use dbus method in such scenario.
    
    Link: https://builds.sr.ht/~bzg/job/961763
---
 lisp/org-clock.el | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 482b3c5a8f..053050adb1 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -1221,11 +1221,12 @@ If `only-dangling-p' is non-nil, only ask to resolve 
dangling
   (when (and (boundp 'dbus-runtime-version)
              (require 'dbus nil t)
              (member "org.freedesktop.login1" (dbus-list-activatable-names)))
-    (dbus-call-method
-     :system "org.freedesktop.login1"
-     "/org/freedesktop/login1"
-     "org.freedesktop.login1.Manager"
-     "GetSessionByPID" (emacs-pid)))
+    (ignore-errors
+      (dbus-call-method
+       :system "org.freedesktop.login1"
+       "/org/freedesktop/login1"
+       "org.freedesktop.login1.Manager"
+       "GetSessionByPID" (emacs-pid))))
   "D-Bus session path for the elogind interface.")
 
 (defun org-logind-user-idle-seconds ()



reply via email to

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