Merge lp:~chipaca/ubuntu-push/relativize-sounds into lp:ubuntu-push/automatic

[John Lenton]

Prune the XDG path from the beginning of accounts-set sound files.

[Samuele Pedroni (pedronis)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~chipaca/ubuntu-push/relativize-sounds into lp:ubuntu-push/automatic failed. Below is the output from the failed tests.

scripts/deps.sh ubuntu-push-client.go
scripts/deps.sh server/dev/server.go
scripts/deps.sh server/acceptance/cmd/acceptanceclient.go
/mnt/tarmac/cache/ubuntu-push-automatic/go-ws/bin/godeps -t launchpad.net/ubuntu-push launchpad.net/ubuntu-push/accounts launchpad.net/ubuntu-push/bus launchpad.net/ubuntu-push/bus/accounts launchpad.net/ubuntu-push/bus/connectivity launchpad.net/ubuntu-push/bus/emblemcounter launchpad.net/ubuntu-push/bus/haptic launchpad.net/ubuntu-push/bus/networkmanager launchpad.net/ubuntu-push/bus/notifications launchpad.net/ubuntu-push/bus/polld launchpad.net/ubuntu-push/bus/powerd launchpad.net/ubuntu-push/bus/systemimage launchpad.net/ubuntu-push/bus/testing launchpad.net/ubuntu-push/bus/unitygreeter launchpad.net/ubuntu-push/bus/windowstack launchpad.net/ubuntu-push/click launchpad.net/ubuntu-push/click/cappinfo launchpad.net/ubuntu-push/click/cblacklist launchpad.net/ubuntu-push/click/cclick launchpad.net/ubuntu-push/click/testing launchpad.net/ubuntu-push/client launchpad.net/ubuntu-push/client/gethosts launchpad.net/ubuntu-push/client/service launchpad.net/ubuntu-push/client/session launchpad.net/ubuntu-push/client/session/seenstate launchpad.net/ubuntu-push/config launchpad.net/ubuntu-push/external/murmur3 launchpad.net/ubuntu-push/identifier launchpad.net/ubuntu-push/identifier/testing launchpad.net/ubuntu-push/launch_helper launchpad.net/ubuntu-push/launch_helper/cual launchpad.net/ubuntu-push/launch_helper/helper_finder launchpad.net/ubuntu-push/launch_helper/legacy launchpad.net/ubuntu-push/logger launchpad.net/ubuntu-push/messaging launchpad.net/ubuntu-push/messaging/cmessaging launchpad.net/ubuntu-push/messaging/reply launchpad.net/ubuntu-push/nih launchpad.net/ubuntu-push/nih/cnih launchpad.net/ubuntu-push/poller launchpad.net/ubuntu-push/protocol launchpad.net/ubuntu-push/server launchpad.net/ubuntu-push/server/api launchpad.net/ubuntu-push/server/broker launchpad.net/ubuntu-push/server/broker/simple launchpad.net/ubuntu-push/server/broker/testing launchpad.net/ubuntu-push/server/broker/testsuite launchpad.net/ubuntu-push/server/dev launchpad.net/ubuntu-push/server/listener launchpad.net/ubuntu-push/server/session launchpad.net/ubuntu-push/server/store launchpad.net/ubuntu-push/sounds launchpad.net/ubuntu-push/testing launchpad.net/ubuntu-push/testing/condition launchpad.net/ubuntu-push/urldispatcher launchpad.net/ubuntu-push/urldispatcher/curldispatcher launchpad.net/ubuntu-push/util launchpad.net/ubuntu-push/server/acceptance/cmd/ launchpad.net/ubuntu-push/server/dev/ launchpad.net/ubuntu-push/ 2>/dev/null | cat > dependencies.tsv
rm -f -r /mnt/tarmac/cache/ubuntu-push-automatic/go-ws/pkg
mkdir -p /mnt/tarmac/cache/ubuntu-push-automatic/go-ws/bin
mkdir -p /mnt/tarmac/cache/ubuntu-push-automatic/go-ws/pkg
go get -u launchpad.net/godeps
go get -d -u launchpad.net/gocheck launchpad.net/go-dbus/v1 launchpad.net/go-xdg/v0 code.google.com/p/gosqlite/sqlite3 code.google.com/p/go-uuid/uuid
/mnt/tarmac/cache/ubuntu-push-automatic/go-ws/bin/godeps -u dependencies.tsv
code.g...

[lp:~chipaca/ubuntu-push/relativize-sounds]

375. By John Lenton on 2015-03-06

work around a bit of a bug in xdg

=== modified file 'bus/accounts/accounts.go'
--- bus/accounts/accounts.go	2015-03-05 16:15:19 +0000
+++ bus/accounts/accounts.go	2015-03-06 12:45:21 +0000
@@ -21,9 +21,11 @@
 import (
 	"fmt"
 	"os/user"
+	"strings"
 	"sync"
 
 	"launchpad.net/go-dbus/v1"
+	"launchpad.net/go-xdg/v0"
 
 	"launchpad.net/ubuntu-push/bus"
 	"launchpad.net/ubuntu-push/logger"
@@ -238,6 +240,16 @@
 		return
 	}
 
+	for _, dir := range xdg.Data.Dirs()[1:] {
+		if dir[len(dir)-1] != '/' {
+			dir += "/"
+		}
+		if strings.HasPrefix(snd, dir) {
+			snd = snd[len(dir):]
+			break
+		}
+	}
+
 	a.messageSound = snd
 }
 

=== modified file 'bus/accounts/accounts_test.go'
--- bus/accounts/accounts_test.go	2015-03-05 16:15:19 +0000
+++ bus/accounts/accounts_test.go	2015-03-06 12:45:21 +0000
@@ -164,6 +164,12 @@
 	c.Check(a.messageSound, Equals, "xyzzy")
 }
 
+func (s *AccSuite) TestUpdateMessageSoundPrunesXDG(c *C) {
+	a := New(nil, s.log).(*accounts)
+	a.updateMessageSound(dbus.Variant{"/usr/share/xyzzy"})
+	c.Check(a.messageSound, Equals, "xyzzy")
+}
+
 func (s *AccSuite) TestPropsHandler(c *C) {
 	endp := testibus.NewTestingEndpoint(nil, condition.Work(false))