Merge lp:ubuntu-push/automatic into lp:ubuntu-push

Proposed by Jonas G. Drange on 2016-04-29
Status: Merged
Approved by: Jonas G. Drange on 2016-04-29
Approved revision: 426
Merged at revision: 161
Proposed branch: lp:ubuntu-push/automatic
Merge into: lp:ubuntu-push
Diff against target: 65 lines (+3/-7)
6 files modified
bus/connectivity/connectivity_test.go (+1/-1)
bus/networkmanager/networkmanager.go (+1/-1)
client/service/postal_test.go (+1/-0)
debian/source/format (+0/-1)
docs/example-server/.bzrignore (+0/-1)
docs/example-server/.gitignore (+0/-3)
To merge this branch: bzr merge lp:ubuntu-push/automatic
Reviewer Review Type Date Requested Status
Ubuntu Push Hackers 2016-04-29 Pending
Review via email: mp+293396@code.launchpad.net

Commit message

Correctly refer to NMState as “State”, not “state”, as the move from gdbus-lib to gdbus requires it.

To post a comment you must log in.
lp:ubuntu-push/automatic updated on 2016-05-03
427. By Jonas G. Drange on 2016-05-02

sync changelog between automatic and trunk

428. By Timo Jyrinki on 2016-05-02

remove debian/source, not needed

429. By Simon Fels on 2016-05-03

[r=jonas-drange] Use source format 3.0 (quilt) again

Removing debian/source/ in a previous commit brough us back to source format 1.0 which doesn't preserve the executable flag on our debian/*.install files.

430. By Jonas G. Drange on 2016-05-03

[r=morphis] skip test that would be non-trivial to fix, but blocks rootfs from building for OTA11

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bus/connectivity/connectivity_test.go'
2--- bus/connectivity/connectivity_test.go 2015-04-29 15:17:49 +0000
3+++ bus/connectivity/connectivity_test.go 2016-05-03 11:36:50 +0000
4@@ -167,7 +167,7 @@
5
6 func (rep *racyEndpoint) GetProperty(prop string) (interface{}, error) {
7 switch prop {
8- case "state":
9+ case "State":
10 rep.lock.Lock()
11 defer rep.lock.Unlock()
12 rep.stateGot = true
13
14=== modified file 'bus/networkmanager/networkmanager.go'
15--- bus/networkmanager/networkmanager.go 2015-03-30 12:04:49 +0000
16+++ bus/networkmanager/networkmanager.go 2016-05-03 11:36:50 +0000
17@@ -76,7 +76,7 @@
18 */
19
20 func (nm *networkManager) GetState() State {
21- s, err := nm.bus.GetProperty("state")
22+ s, err := nm.bus.GetProperty("State")
23 if err != nil {
24 nm.log.Errorf("failed getting current state: %s", err)
25 nm.log.Debugf("defaulting state to Unknown")
26
27=== modified file 'client/service/postal_test.go'
28--- client/service/postal_test.go 2015-11-20 14:48:53 +0000
29+++ client/service/postal_test.go 2016-05-03 11:36:50 +0000
30@@ -380,6 +380,7 @@
31 // Post() tests
32
33 func (ps *postalSuite) TestPostWorks(c *C) {
34+ c.Skip("Skipping due to lp:1577723")
35 svc := ps.replaceBuses(NewPostalService(ps.cfg, ps.log))
36 svc.msgHandler = nil
37 ch := installTickMessageHandler(svc)
38
39=== added directory 'debian/source'
40=== removed directory 'debian/source'
41=== added file 'debian/source/format'
42--- debian/source/format 1970-01-01 00:00:00 +0000
43+++ debian/source/format 2016-05-03 11:36:50 +0000
44@@ -0,0 +1,1 @@
45+3.0 (quilt)
46
47=== removed file 'debian/source/format'
48--- debian/source/format 2014-03-25 14:35:07 +0000
49+++ debian/source/format 1970-01-01 00:00:00 +0000
50@@ -1,1 +0,0 @@
51-3.0 (quilt)
52
53=== removed file 'docs/example-server/.bzrignore'
54--- docs/example-server/.bzrignore 2014-09-05 14:57:17 +0000
55+++ docs/example-server/.bzrignore 1970-01-01 00:00:00 +0000
56@@ -1,1 +0,0 @@
57-.git
58
59=== removed file 'docs/example-server/.gitignore'
60--- docs/example-server/.gitignore 2014-09-05 14:57:17 +0000
61+++ docs/example-server/.gitignore 1970-01-01 00:00:00 +0000
62@@ -1,3 +0,0 @@
63-.bzr
64-.bzrignore
65-node_modules

Subscribers

People subscribed via source and target branches