Update vendoring for github.com/godbus/dbus

This commit is contained in:
Ben Kochie 2016-12-16 12:55:26 +01:00
commit 84c6c66a35
16 changed files with 888 additions and 270 deletions

View file

@ -5,23 +5,27 @@ package dbus
import (
"bytes"
"errors"
"os"
"os/exec"
)
func sessionBusPlatform() (*Conn, error) {
func getSessionBusPlatformAddress() (string, error) {
cmd := exec.Command("dbus-launch")
b, err := cmd.CombinedOutput()
if err != nil {
return nil, err
return "", err
}
i := bytes.IndexByte(b, '=')
j := bytes.IndexByte(b, '\n')
if i == -1 || j == -1 {
return nil, errors.New("dbus: couldn't determine address of session bus")
return "", errors.New("dbus: couldn't determine address of session bus")
}
return Dial(string(b[i+1 : j]))
env, addr := string(b[0:i]), string(b[i+1:j])
os.Setenv(env, addr)
return addr, nil
}