Merge lp:~seb128/update-manager/check-none-controller into lp:update-manager

[Sebastien Bacher]

check if there is a controller before using it

check if there is a controller before using it

that check was there before http://bazaar.launchpad.net/~ubuntu-core-dev/update-manager/main/revision/2622.1.7 and got dropped in the refactoring

[Barry Warsaw (barry)]

LGTM, though do you know of a way to reproduce the problem?

[Barry Warsaw (barry)]

review: Approve

[Sebastien Bacher (seb128)]

> LGTM, though do you know of a way to reproduce the problem?

no, I tried for a bit to trigger it but couldn't, the fix should be safe though since that's what was done before

[Barry Warsaw (barry)]

On Dec 11, 2013, at 09:06 AM, Sebastien Bacher wrote:

>> LGTM, though do you know of a way to reproduce the problem?
>
>no, I tried for a bit to trigger it but couldn't, the fix should be safe
>though since that's what was done before

Agreed, and by visual inspection it looked fine, so I committed it to trunk
and uploaded. Hey, that's what bug reports are for, right? :)

[Sebastien Bacher (seb128)]

> Agreed, and by visual inspection it looked fine, so I committed it to trunk
> and uploaded. Hey, that's what bug reports are for, right? :)

lol, indeed, thanks! ;-)

=== modified file 'UpdateManager/UpdateManager.py'
--- UpdateManager/UpdateManager.py	2013-07-12 05:06:12 +0000
+++ UpdateManager/UpdateManager.py	2013-12-04 19:02:20 +0000
@@ -171,9 +171,10 @@
         if not self.get_sensitive():
             return True
 
-        controller_close = self.controller.close()
-        if controller_close:
-            return controller_close
+        if self.controller:
+            controller_close = self.controller.close()
+            if controller_close:
+                return controller_close
         self.exit()
 
     def exit(self):