Skip to content

Commit 71aa0e7

Browse files
committed
dbus: Fix API break from godbus
Something in godbus seems to have broken API, thus breaking builds including `go get`. As an aside, I don't think *this* project should include the Gopkg.toml file. We should always follow git master automatically. Having said that I've patched it anyways until we can discuss more.
1 parent ad9ff7f commit 71aa0e7

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Gopkg.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
[[constraint]]
66
name = "github.com/godbus/dbus"
7-
version = "4.1.0"
7+
version = "5.0"
88

99
[prune]
1010
go-tests = true

dbus/dbus.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ func NewUserConnection() (*Conn, error) {
143143
func NewSystemdConnection() (*Conn, error) {
144144
return NewConnection(func() (*dbus.Conn, error) {
145145
// We skip Hello when talking directly to systemd.
146-
return dbusAuthConnection(func() (*dbus.Conn, error) {
146+
return dbusAuthConnection(func(opts ...dbus.ConnOption) (*dbus.Conn, error) {
147147
return dbus.Dial("unix:path=/run/systemd/private")
148148
})
149149
})
@@ -201,7 +201,7 @@ func (c *Conn) GetManagerProperty(prop string) (string, error) {
201201
return variant.String(), nil
202202
}
203203

204-
func dbusAuthConnection(createBus func() (*dbus.Conn, error)) (*dbus.Conn, error) {
204+
func dbusAuthConnection(createBus func(opts ...dbus.ConnOption) (*dbus.Conn, error)) (*dbus.Conn, error) {
205205
conn, err := createBus()
206206
if err != nil {
207207
return nil, err
@@ -221,7 +221,7 @@ func dbusAuthConnection(createBus func() (*dbus.Conn, error)) (*dbus.Conn, error
221221
return conn, nil
222222
}
223223

224-
func dbusAuthHelloConnection(createBus func() (*dbus.Conn, error)) (*dbus.Conn, error) {
224+
func dbusAuthHelloConnection(createBus func(opts ...dbus.ConnOption) (*dbus.Conn, error)) (*dbus.Conn, error) {
225225
conn, err := dbusAuthConnection(createBus)
226226
if err != nil {
227227
return nil, err

0 commit comments

Comments
 (0)