Merge lp:~timo-jyrinki/ubuntu-push/test_ignore_file_removal into lp:ubuntu-push

Proposed by Timo Jyrinki on 2016-05-02
Status: Needs review
Proposed branch: lp:~timo-jyrinki/ubuntu-push/test_ignore_file_removal
Merge into: lp:ubuntu-push
Diff against target: 64 lines (+6/-5)
6 files modified
bus/connectivity/connectivity_test.go (+1/-1)
bus/networkmanager/networkmanager.go (+1/-1)
debian/rules (+2/-0)
debian/source/format (+0/-1)
debian/ubuntu-push-client.install (+1/-1)
debian/ubuntu-push-dev-server.install (+1/-1)
To merge this branch: bzr merge lp:~timo-jyrinki/ubuntu-push/test_ignore_file_removal
Reviewer Review Type Date Requested Status
Ubuntu Push Hackers 2016-05-02 Pending
Review via email: mp+293511@code.launchpad.net

Commit message

test

Description of the change

test removing the ignore files

To post a comment you must log in.
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 Timo Jyrinki on 2016-05-02

try hack to replace >=

430. By Timo Jyrinki on 2016-05-02

hmm

Unmerged revisions

430. By Timo Jyrinki on 2016-05-02

hmm

429. By Timo Jyrinki on 2016-05-02

try hack to replace >=

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-02 14:05:46 +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-02 14:05:46 +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 'debian/rules'
28--- debian/rules 2016-03-10 20:24:21 +0000
29+++ debian/rules 2016-05-02 14:05:46 +0000
30@@ -29,6 +29,8 @@
31 GODEBUG=cgocheck=0 dh_auto_test -O--buildsystem=golang
32
33 override_dh_install:
34+ mkdir -p debian/tmp/usr/bin/
35+ #ln -s /usr/lib/ubuntu-push-client/ubuntu-push-client debian/tmp/usr/bin/ubuntu-push
36 dh_install -Xusr/bin/cmd --fail-missing
37
38 %:
39
40=== removed directory 'debian/source'
41=== removed file 'debian/source/format'
42--- debian/source/format 2014-03-25 14:35:07 +0000
43+++ debian/source/format 1970-01-01 00:00:00 +0000
44@@ -1,1 +0,0 @@
45-3.0 (quilt)
46
47=== modified file 'debian/ubuntu-push-client.install'
48--- debian/ubuntu-push-client.install 2014-08-12 02:31:51 +0000
49+++ debian/ubuntu-push-client.install 2016-05-02 14:05:46 +0000
50@@ -5,5 +5,5 @@
51 debian/push-helper.hook /usr/share/click/hooks
52 signing-helper/signing-helper /usr/lib/ubuntu-push-client
53 scripts/click-hook /usr/lib/ubuntu-push-client
54-usr/bin/ubuntu-push => /usr/lib/ubuntu-push-client/ubuntu-push-client
55+usr/bin/ubuntu-push
56
57
58=== modified file 'debian/ubuntu-push-dev-server.install'
59--- debian/ubuntu-push-dev-server.install 2014-07-17 23:01:19 +0000
60+++ debian/ubuntu-push-dev-server.install 2016-05-02 14:05:46 +0000
61@@ -1,2 +1,2 @@
62 #!/usr/bin/dh-exec
63-usr/bin/dev => /usr/bin/ubuntu-push-dev-server
64+usr/bin/dev

Subscribers

People subscribed via source and target branches