Merge lp:~sergiusens/nuntium/not_attached into lp:nuntium

[Sergio Schvezov]

Retry on NotAttached ofono errors

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:83
http://jenkins.qa.ubuntu.com/job/nuntium-ci/18/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nuntium-utopic-amd64-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nuntium-utopic-armhf-ci/18
        deb: http://jenkins.qa.ubuntu.com/job/nuntium-utopic-armhf-ci/18/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nuntium-utopic-i386-ci/18

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/nuntium-ci/18/rebuild

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

LGTM

review: Approve

[lp:~sergiusens/nuntium/not_attached]

84. By Sergio Schvezov on 2014-10-02

bzr pump

85. By Sergio Schvezov on 2014-10-02

format fix

=== modified file 'ofono/modem.go'
--- ofono/modem.go	2014-10-02 01:24:38 +0000
+++ ofono/modem.go	2014-10-02 01:24:38 +0000
@@ -42,6 +42,7 @@
 const (
 	ofonoAttachInProgressError = "org.ofono.AttachInProgress"
 	ofonoInProgressError       = "org.ofono.InProgress"
+	ofonoNotAttachedError      = "org.ofono.Error.NotAttached"
 )
 
 type OfonoContext struct {
@@ -269,7 +270,7 @@
 
 func activationErrorNeedsWait(err error) bool {
 	if dbusErr, ok := err.(*dbus.Error); ok {
-		return dbusErr.Name == ofonoInProgressError || dbusErr.Name == ofonoAttachInProgressError
+		return dbusErr.Name == ofonoInProgressError || dbusErr.Name == ofonoAttachInProgressError || dbusErr.Name == ofonoNotAttachedError
 	}
 	return false
 }