From 65094b63cddb4357ed05133aa6377355edc3b587 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Tue, 25 Feb 2025 00:57:35 +0900 Subject: [PATCH] system/dbus: filter context cancellation error This message would otherwise show up when alternative exit path is taken due to a signal. Signed-off-by: Ophestra --- system/dbus.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/system/dbus.go b/system/dbus.go index cbb127e..5f62b2e 100644 --- a/system/dbus.go +++ b/system/dbus.go @@ -2,6 +2,7 @@ package system import ( "bytes" + "context" "errors" "log" "strings" @@ -96,7 +97,12 @@ func (d *DBus) revert(sys *I, _ *Criteria) error { sys.println("terminating message bus proxy") d.proxy.Close() defer sys.println("message bus proxy exit") - return sys.wrapErrSuffix(d.proxy.Wait(), "message bus proxy error:") + err := d.proxy.Wait() + if errors.Is(err, context.Canceled) { + sys.println("message bus proxy canceled upstream") + err = nil + } + return sys.wrapErrSuffix(err, "message bus proxy error:") } func (d *DBus) Is(o Op) bool {