Merge lp:~seb128/software-properties/except_variable_name into lp:software-properties

[Sebastien Bacher]

use different variable name in exception, python3 deletes the target

use different variable name in exception, python3 deletes the target

see http://legacy.python.org/dev/peps/pep-3110/#semantic-changes for explanation on the behaviour

[Didier Roche (didrocks)]

After looking at the file context (with error being initialized upper), +1!

review: Approve

=== modified file 'softwareproperties/gtk/DialogCacheOutdated.py'
--- softwareproperties/gtk/DialogCacheOutdated.py	2014-09-11 09:06:49 +0000
+++ softwareproperties/gtk/DialogCacheOutdated.py	2015-09-28 14:58:00 +0000
@@ -57,11 +57,11 @@
         except aptdaemon.errors.NotAuthorizedError:
             # Silently ignore auth failures
             return
-        except aptdaemon.errors.TransactionFailed as error:
-            pass
-        except Exception as error:
+        except aptdaemon.errors.TransactionFailed as _error:
+            error = _error
+        except Exception as _error:
             error = aptdaemon.errors.TransactionFailed(aptdaemon.enums.ERROR_UNKNOWN,
-                                                       str(error))
+                                                       str(_error))
         dia = AptErrorDialog(error)
         dia.run()
         dia.hide()