security/fortify
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 35 Wiki Activity

system/dbus: filter context cancellation error
All checks were successful
Test / Create distribution (push) Successful in 26s
Details
Test / Fortify (push) Successful in 2m21s
Details
Test / Data race detector (push) Successful in 3m5s
Details
Test / Flake checks (push) Successful in 41s
Details

Browse Source 
This message would otherwise show up when alternative exit path is taken due to a signal.

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
Ophestra 2025-02-25 00:57:35 +09:00
parent f0a082ec84
commit 65094b63cd
Signed by: cat
SSH Key Fingerprint: SHA256:gQ67O0enBZ7UdZypgtspB2FDM1g3GVw8nX0XSdcFw8Q
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
system/dbus.go
View File

@ -2,6 +2,7 @@ package system
import ( import (
"bytes" "bytes"
"context"
"errors" "errors"
"log" "log"
"strings" "strings"
@ -96,7 +97,12 @@ func (d *DBus) revert(sys *I, _ *Criteria) error {
sys.println("terminating message bus proxy") sys.println("terminating message bus proxy")
d.proxy.Close() d.proxy.Close()
defer sys.println("message bus proxy exit") 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 { func (d *DBus) Is(o Op) bool {