Skip to content

Commit 8a2c225

Browse files
angelcerveraroldandustymabe
authored andcommitted
systemddbus: go-systemd/v22/dbus deprecated function
Update systemd-go library ``` got get github.com/coreos/go-systemd/v22/dbus@latest go mod vendor go mod tidy ``` And replace sdconn.SubscribeUnitsCustom with sdconn.SubscribeUnitsCustomContext in kolet.go This fixes the following error: SA1019: sdconn.SubscribeUnitsCustom is deprecated: use SubscribeUnitsCustomContext instead. (staticcheck)
1 parent 4334053 commit 8a2c225

12 files changed

Lines changed: 107 additions & 210 deletions

File tree

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ require (
2626
github.com/coreos/butane v0.25.1
2727
github.com/coreos/go-semver v0.3.1
2828
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e
29-
github.com/coreos/go-systemd/v22 v22.6.0
29+
github.com/coreos/go-systemd/v22 v22.7.0
3030
github.com/coreos/ignition/v2 v2.25.0
3131
github.com/coreos/pkg v0.0.0-20240122114842-bbd7aa9bf6fb
3232
github.com/coreos/rpmostree-client-go v0.0.0-20240514234259-72a33e8554b6

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr
112112
github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec=
113113
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e h1:Wf6HqHfScWJN9/ZjdUKyjop4mf3Qdd+1TvvltAvM3m8=
114114
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
115-
github.com/coreos/go-systemd/v22 v22.6.0 h1:aGVa/v8B7hpb0TKl0MWoAavPDmHvobFe5R5zn0bCJWo=
116-
github.com/coreos/go-systemd/v22 v22.6.0/go.mod h1:iG+pp635Fo7ZmV/j14KUcmEyWF+0X7Lua8rrTWzYgWU=
115+
github.com/coreos/go-systemd/v22 v22.7.0 h1:LAEzFkke61DFROc7zNLX/WA2i5J8gYqe0rSj9KI28KA=
116+
github.com/coreos/go-systemd/v22 v22.7.0/go.mod h1:xNUYtjHu2EDXbsxz1i41wouACIwT7Ybq9o0BQhMwD0w=
117117
github.com/coreos/ignition/v2 v2.25.0 h1:4TboIy9z2ofMZmIv5ypyXCFTeKjPNwE5mQNpgkJLdMM=
118118
github.com/coreos/ignition/v2 v2.25.0/go.mod h1:L8tzd8rDzGMKtEvJ22Rk41jW5chE50sDK5Rn/8C1JsE=
119119
github.com/coreos/pkg v0.0.0-20240122114842-bbd7aa9bf6fb h1:GIzvVQ9UkUlOhSDlqmrQAAAUd6R3E+caIisNEyWXvNE=

mantle/cmd/kolet/kolet.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ func runExtUnit(cmd *cobra.Command, args []string) error {
403403
return n != unitname
404404
}
405405
compareFunc := func(u1, u2 *systemddbus.UnitStatus) bool { return *u1 != *u2 }
406-
unitevents, uniterrs := sdconn.SubscribeUnitsCustom(time.Second, 0, compareFunc, filterFunc)
406+
unitevents, uniterrs := sdconn.SubscribeUnitsCustomContext(ctx, time.Second, 0, compareFunc, filterFunc)
407407

408408
for {
409409
systemdjournal.Print(systemdjournal.PriInfo, "Awaiting events")

vendor/github.com/coreos/go-systemd/v22/dbus/dbus.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)