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-04-29 12:31:02 +0000
4
@@ -167,7 +167,7 @@
5
167
167
6
168
func (rep *racyEndpoint) GetProperty(prop string) (interface{}, error) {
168
func (rep *racyEndpoint) GetProperty(prop string) (interface{}, error) {
7
169
	switch prop {
169
	switch prop {
9
170
	case "state":
170
	case "State":
10
171
		rep.lock.Lock()
171
		rep.lock.Lock()
11
172
		defer rep.lock.Unlock()
172
		defer rep.lock.Unlock()
12
173
		rep.stateGot = true
173
		rep.stateGot = true
13
174
174
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-04-29 12:31:02 +0000
17
@@ -76,7 +76,7 @@
18
76
*/
76
*/
19
77
77
20
78
func (nm *networkManager) GetState() State {
78
func (nm *networkManager) GetState() State {
22
79
	s, err := nm.bus.GetProperty("state")
79
	s, err := nm.bus.GetProperty("State")
23
80
	if err != nil {
80
	if err != nil {
24
81
		nm.log.Errorf("failed getting current state: %s", err)
81
		nm.log.Errorf("failed getting current state: %s", err)
25
82
		nm.log.Debugf("defaulting state to Unknown")
82
		nm.log.Debugf("defaulting state to Unknown")
Status:	Merged
Approved by:	Jonas G. Drange on 2016-04-29
Approved revision:	427
Merged at revision:	426
Proposed branch:	lp:~jonas-drange/ubuntu-push/state-State
Merge into:	lp:ubuntu-push/automatic
Diff against target:	25 lines (+2/-2) 2 files modified bus/connectivity/connectivity_test.go (+1/-1) bus/networkmanager/networkmanager.go (+1/-1)
To merge this branch:	bzr merge lp:~jonas-drange/ubuntu-push/state-State
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Simon Fels		2016-04-26	Approve on 2016-04-27
Review via email: mp+292946@code.launchpad.net
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-04-29 12:31:02 +0000
4	@@ -167,7 +167,7 @@
5	167		167
6	168	func (rep *racyEndpoint) GetProperty(prop string) (interface{}, error) {	168	func (rep *racyEndpoint) GetProperty(prop string) (interface{}, error) {
7	169	switch prop {	169	switch prop {
9	170	case "state":	170	case "State":
10	171	rep.lock.Lock()	171	rep.lock.Lock()
11	172	defer rep.lock.Unlock()	172	defer rep.lock.Unlock()
12	173	rep.stateGot = true	173	rep.stateGot = true
13	174		174
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-04-29 12:31:02 +0000
17	@@ -76,7 +76,7 @@
18	76	*/	76	*/
19	77		77
20	78	func (nm *networkManager) GetState() State {	78	func (nm *networkManager) GetState() State {
22	79	s, err := nm.bus.GetProperty("state")	79	s, err := nm.bus.GetProperty("State")
23	80	if err != nil {	80	if err != nil {
24	81	nm.log.Errorf("failed getting current state: %s", err)	81	nm.log.Errorf("failed getting current state: %s", err)
25	82	nm.log.Debugf("defaulting state to Unknown")	82	nm.log.Debugf("defaulting state to Unknown")