Ubuntu Push Notifications

Merge lp:~jonas-drange/ubuntu-push/fix-1628327 into lp:ubuntu-push

  1. fix-1628327
  2. Merge into trunk
Proposed by Jonas G. Drange
Status: Merged
Approved by: Jonas G. Drange
Approved revision: 184
Merged at revision: 173
Proposed branch: lp:~jonas-drange/ubuntu-push/fix-1628327
Merge into: lp:ubuntu-push
Diff against target: 194 lines (+32/-17)
12 files modified
Makefile (+2/-2)
bus/haptic/haptic.go (+2/-2)
bus/notifications/raw.go (+1/-1)
click/cnotificationsettings/cnotificationsettings.go (+1/-1)
client/client.go (+17/-2)
client/service/postal.go (+1/-1)
client/session/seenstate/sqlseenstate.go (+1/-1)
client/session/seenstate/sqlseenstate_test.go (+1/-1)
debian/control (+3/-2)
dependencies.tsv (+2/-2)
logger/logger_test.go (+0/-1)
server/api/handlers.go (+1/-1)
To merge this branch: bzr merge lp:~jonas-drange/ubuntu-push/fix-1628327
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Needs Fixing
Guillermo Gonzalez Approve
Łukasz Zemczak Approve
Review via email: mp+307159@code.launchpad.net

This proposal supersedes a proposal from 2016-09-28.

Commit message

* Drops dead dependencies, replaces them with newer ones.
* Allows u-p to run without system image.
* Adds upstart dep to avoid dep wait on s390x.
* Fixes some formatting issues by use of go fmt.

To post a comment you must log in.
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:177
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-push-ci/34/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1653/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1653
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1499/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1499
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1499/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1499
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1499/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1499/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1499
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1499/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1499
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1499/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1499/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1499/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1499/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-push-ci/34/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:178
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-push-ci/35/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1654/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1654
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1500/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1500
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1500/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1500/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1500/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1500/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1500/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1500/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1500
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1500/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1500/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-push-ci/35/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:179
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-push-ci/36/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1668/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1668
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1514/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1514
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1514/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1514/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1514/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1514/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1514/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1514/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1514
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1514/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1514/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-push-ci/36/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:180
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-push-ci/37/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1669/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1669
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1515/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1515
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1515/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1515
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1515/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1515/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1515
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1515/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1515
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1515/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1515/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1515/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1515
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1515/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-push-ci/37/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:180
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-push-ci/38/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1670/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1670
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1516/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1516
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1516/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1516
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1516/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1516/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1516/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1516/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1516/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1516
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1516/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1516/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-push-ci/38/rebuild

review: Needs Fixing (continuous-integration)
lp:~jonas-drange/ubuntu-push/fix-1628327 updated
181. By Jonas G. Drange

update deps tsv

182. By Jonas G. Drange

drop --with-install as it is redundant

183. By Jonas G. Drange

add upstart depends

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:182
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-push-ci/39/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1673/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1673
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1519/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1519
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1519/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1519
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1519/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1519/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1519
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1519/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1519
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1519/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1519/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1519
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1519/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1519
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1519/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-push-ci/39/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:183
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-push-ci/40/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1675/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1675
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1521/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1521
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1521/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1521
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1521/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1521/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1521
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1521/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1521
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1521/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1521/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1521
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1521/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1521
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1521/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-push-ci/40/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Looks good from my POV. But please note that I have no expertise in golang, so the GO bits would be nice to have reviewed by somone else as well. Packaging wise it's all good either way.
One thing: please mention the upstart dep addition to the commit message.

review: Approve
Revision history for this message
Guillermo Gonzalez (verterok) wrote :

looks good. but I'm a bit worried about not checking the error returned by systemimage, as it might be a valid error case for a system with system-image.
But I have no idea about the error types returned by the dbus stuff. My only request is to please double check that case.

Thanks.

review: Approve
Revision history for this message
Jonas G. Drange (jonas-drange) wrote :

Thanks, Guillermo. You are right, let me think about it. I guess we'd want to crash if 1) system-image runs and 2) system-image returns some valid error.

lp:~jonas-drange/ubuntu-push/fix-1628327 updated
184. By Jonas G. Drange

only allow SI to fail using a specific error message

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:184
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-push-ci/41/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1718/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1718
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1563/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1563
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1563/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1563
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1563/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1563/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1563/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1563
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1563/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1563/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1563
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1563/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1563
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1563/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-push-ci/41/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Makefile'
--- Makefile 2016-03-09 16:12:39 +0000
+++ Makefile 2016-10-03 11:09:10 +0000
@@ -10,8 +10,8 @@
10GODEPS = launchpad.net/gocheck10GODEPS = launchpad.net/gocheck
11GODEPS += launchpad.net/go-dbus/v111GODEPS += launchpad.net/go-dbus/v1
12GODEPS += launchpad.net/go-xdg/v012GODEPS += launchpad.net/go-xdg/v0
13GODEPS += code.google.com/p/gosqlite/sqlite313GODEPS += github.com/mattn/go-sqlite3
14GODEPS += code.google.com/p/go-uuid/uuid14GODEPS += github.com/pborman/uuid
1515
16# cgocheck=0 is a workaround for lp:155519816# cgocheck=0 is a workaround for lp:1555198
17GOTEST := GODEBUG=cgocheck=0 ./scripts/goctest17GOTEST := GODEBUG=cgocheck=0 ./scripts/goctest
1818
=== modified file 'bus/haptic/haptic.go'
--- bus/haptic/haptic.go 2016-07-08 17:05:38 +0000
+++ bus/haptic/haptic.go 2016-10-03 11:09:10 +0000
@@ -61,8 +61,8 @@
61 return false61 return false
62 }62 }
6363
64 if (haptic.acc.SilentMode()) {64 if haptic.acc.SilentMode() {
65 if (!vibrateInSilentMode()) {65 if !vibrateInSilentMode() {
66 haptic.log.Debugf("[%s] vibrate disabled by user when in Silent Mode.", nid)66 haptic.log.Debugf("[%s] vibrate disabled by user when in Silent Mode.", nid)
67 return false67 return false
68 }68 }
6969
=== modified file 'bus/notifications/raw.go'
--- bus/notifications/raw.go 2016-07-08 17:05:38 +0000
+++ bus/notifications/raw.go 2016-10-03 11:09:10 +0000
@@ -141,7 +141,7 @@
141 panic("please check notification is not nil before calling present")141 panic("please check notification is not nil before calling present")
142 }142 }
143143
144 if (!canUseBubblesNotify(app)) {144 if !canUseBubblesNotify(app) {
145 raw.log.Debugf("[%s] bubbles disabled by user for this app.", nid)145 raw.log.Debugf("[%s] bubbles disabled by user for this app.", nid)
146146
147 if raw.sound != nil {147 if raw.sound != nil {
148148
=== modified file 'click/cnotificationsettings/cnotificationsettings.go'
--- click/cnotificationsettings/cnotificationsettings.go 2016-08-12 21:09:43 +0000
+++ click/cnotificationsettings/cnotificationsettings.go 2016-10-03 11:09:10 +0000
@@ -74,7 +74,7 @@
74 }74 }
7575
76 // Define notifications settings GSettings path76 // Define notifications settings GSettings path
77 if (strcmp(pkgname, "") == 0) { 77 if (strcmp(pkgname, "") == 0) {
78 // Use "dpkg" as package name for legacy apps78 // Use "dpkg" as package name for legacy apps
79 path = g_strconcat(SETTINGS_BASE_PATH, "dpkg/", appname, "/", NULL);79 path = g_strconcat(SETTINGS_BASE_PATH, "dpkg/", appname, "/", NULL);
80 } else {80 } else {
8181
=== modified file 'client/client.go'
--- client/client.go 2016-03-09 16:09:34 +0000
+++ client/client.go 2016-10-03 11:09:10 +0000
@@ -50,6 +50,10 @@
50 "launchpad.net/ubuntu-push/util"50 "launchpad.net/ubuntu-push/util"
51)51)
5252
53const (
54 SI_NO_SERVICE_ERROR = "org.freedesktop.DBus.Error.ServiceUnknown: The name com.canonical.SystemImage was not provided by any .service files"
55)
56
53// ClientConfig holds the client configuration57// ClientConfig holds the client configuration
54type ClientConfig struct {58type ClientConfig struct {
55 connectivity.ConnectivityConfig // q.v.59 connectivity.ConnectivityConfig // q.v.
@@ -293,11 +297,22 @@
293 util.NewAutoRedialer(client.systemImageEndp).Redial()297 util.NewAutoRedialer(client.systemImageEndp).Redial()
294 sysimg := systemimage.New(client.systemImageEndp, client.log)298 sysimg := systemimage.New(client.systemImageEndp, client.log)
295 info, err := sysimg.Information()299 info, err := sysimg.Information()
300
296 if err != nil {301 if err != nil {
297 return err302 /* SI is not running, so don't fail but rather provide unknown/empty details. See lp:1628522 */
303 if err.Error() == SI_NO_SERVICE_ERROR {
304 info = &systemimage.InfoResult{
305 BuildNumber: 0,
306 Device: "unknown",
307 Channel: "",
308 LastUpdate: "",
309 }
310 } else {
311 return err
312 }
298 }313 }
299 client.systemImageInfo = info314 client.systemImageInfo = info
300 return err315 return nil
301}316}
302317
303// initSessionAndPoller creates the session and the poller objects318// initSessionAndPoller creates the session and the poller objects
304319
=== modified file 'client/service/postal.go'
--- client/service/postal.go 2016-07-08 17:05:38 +0000
+++ client/service/postal.go 2016-10-03 11:09:10 +0000
@@ -21,7 +21,7 @@
21 "os"21 "os"
22 "sync"22 "sync"
2323
24 "code.google.com/p/go-uuid/uuid"24 "github.com/pborman/uuid"
2525
26 "launchpad.net/ubuntu-push/bus"26 "launchpad.net/ubuntu-push/bus"
27 "launchpad.net/ubuntu-push/bus/accounts"27 "launchpad.net/ubuntu-push/bus/accounts"
2828
=== modified file 'client/session/seenstate/sqlseenstate.go'
--- client/session/seenstate/sqlseenstate.go 2015-01-29 09:49:36 +0000
+++ client/session/seenstate/sqlseenstate.go 2016-10-03 11:09:10 +0000
@@ -21,7 +21,7 @@
21 "fmt"21 "fmt"
22 "strings"22 "strings"
2323
24 _ "code.google.com/p/gosqlite/sqlite3"24 _ "github.com/mattn/go-sqlite3"
2525
26 "launchpad.net/ubuntu-push/protocol"26 "launchpad.net/ubuntu-push/protocol"
27)27)
2828
=== modified file 'client/session/seenstate/sqlseenstate_test.go'
--- client/session/seenstate/sqlseenstate_test.go 2015-01-29 09:49:36 +0000
+++ client/session/seenstate/sqlseenstate_test.go 2016-10-03 11:09:10 +0000
@@ -19,7 +19,7 @@
19import (19import (
20 "database/sql"20 "database/sql"
2121
22 _ "code.google.com/p/gosqlite/sqlite3"22 _ "github.com/mattn/go-sqlite3"
23 . "launchpad.net/gocheck"23 . "launchpad.net/gocheck"
2424
25 "launchpad.net/ubuntu-push/protocol"25 "launchpad.net/ubuntu-push/protocol"
2626
=== modified file 'debian/control'
--- debian/control 2015-11-30 20:59:30 +0000
+++ debian/control 2016-10-03 11:09:10 +0000
@@ -10,8 +10,8 @@
10 golang-go-dbus-dev,10 golang-go-dbus-dev,
11 golang-go-xdg-dev,11 golang-go-xdg-dev,
12 golang-gocheck-dev,12 golang-gocheck-dev,
13 golang-gosqlite-dev,13 golang-github-mattn-go-sqlite3-dev,
14 golang-uuid-dev,14 golang-github-pborman-uuid-dev,
15 libgcrypt11-dev,15 libgcrypt11-dev,
16 libglib2.0-dev (>= 2.31.6),16 libglib2.0-dev (>= 2.31.6),
17 libmessaging-menu-dev,17 libmessaging-menu-dev,
@@ -24,6 +24,7 @@
24 libaccounts-glib-dev,24 libaccounts-glib-dev,
25 cmake,25 cmake,
26 python3,26 python3,
27 upstart,
27Standards-Version: 3.9.528Standards-Version: 3.9.5
28Homepage: http://launchpad.net/ubuntu-push29Homepage: http://launchpad.net/ubuntu-push
29Vcs-Bzr: lp:ubuntu-push30Vcs-Bzr: lp:ubuntu-push
3031
=== modified file 'dependencies.tsv'
--- dependencies.tsv 2015-11-20 15:03:47 +0000
+++ dependencies.tsv 2016-10-03 11:09:10 +0000
@@ -1,5 +1,5 @@
1code.google.com/p/go-uuid hg 7dda39b2e7d5e265014674c5af696ba4186679e9 111github.com/mattn/go-sqlite3 git 4b0af852c17164dce48e6754e3094c55192e4934 2016-09-27T02:28:46Z
2code.google.com/p/gosqlite hg 74691fb6f83716190870cde1b658538dd4b18eb0 152github.com/pborman/uuid git b984ec7fa9ff9e428bd0cf0abf429384dfbe3e37 2016-08-24T21:06:00Z
3launchpad.net/go-dbus/v1 bzr jlenton@gmail.com-20141023032446-s5icvsucwlv5o38a 1293launchpad.net/go-dbus/v1 bzr jlenton@gmail.com-20141023032446-s5icvsucwlv5o38a 129
4launchpad.net/go-xdg/v0 bzr john.lenton@canonical.com-20140208094800-gubd5md7cro3mtxa 104launchpad.net/go-xdg/v0 bzr john.lenton@canonical.com-20140208094800-gubd5md7cro3mtxa 10
5launchpad.net/gocheck bzr gustavo@niemeyer.net-20140225173054-xu9zlkf9kxhvow02 875launchpad.net/gocheck bzr gustavo@niemeyer.net-20140225173054-xu9zlkf9kxhvow02 87
66
=== modified file 'logger/logger_test.go'
--- logger/logger_test.go 2016-07-18 11:12:23 +0000
+++ logger/logger_test.go 2016-10-03 11:09:10 +0000
@@ -140,7 +140,6 @@
140 baselog.Output(1, "foobar")140 baselog.Output(1, "foobar")
141 logger.Output(1, "foobaz")141 logger.Output(1, "foobaz")
142142
143
144 out := buf.String()143 out := buf.String()
145144
146 /* Workaround for https://github.com/golang/go/issues/16406 which is145 /* Workaround for https://github.com/golang/go/issues/16406 which is
147146
=== modified file 'server/api/handlers.go'
--- server/api/handlers.go 2014-11-17 19:44:15 +0000
+++ server/api/handlers.go 2016-10-03 11:09:10 +0000
@@ -27,7 +27,7 @@
27 "net/http"27 "net/http"
28 "time"28 "time"
2929
30 "code.google.com/p/go-uuid/uuid"30 "github.com/pborman/uuid"
3131
32 "launchpad.net/ubuntu-push/logger"32 "launchpad.net/ubuntu-push/logger"
33 "launchpad.net/ubuntu-push/protocol"33 "launchpad.net/ubuntu-push/protocol"

Subscribers

People subscribed via source and target branches