Merge lp:~sjakthol/update-manager/fix-for-1031280 into lp:update-manager

[Sami Jaktholm]

Fixes bug 1031280 by converting SystemError into string before it's concatenated with the problem description string.

Testcase:
1. Break one of your sources.list entries (e.g. change 'deb http://someurletc...' to 'dab http://someurletc')
2. Open Software Updater
3. Confirm that error dialog appears with description about the issue

Current version in Quantal just crashes without error dialog.

[Michael Vogt (mvo)]

review: Approve

=== modified file 'UpdateManager/UpdateManager.py'
--- UpdateManager/UpdateManager.py	2012-07-06 19:25:03 +0000
+++ UpdateManager/UpdateManager.py	2012-08-11 17:29:18 +0000
@@ -260,7 +260,7 @@
             desc = _("An unresolvable problem occurred while "
                      "initializing the package information.\n\n"
                      "Please report this bug against the 'update-manager' "
-                     "package and include the following error message:\n") + e
+                     "package and include the following error message:\n") + str(e)
             self.start_error(header, desc)
 
         # Let the Gtk event loop breath if it hasn't had a chance.
@@ -275,7 +275,7 @@
             desc = _("An unresolvable problem occurred while "
                      "calculating the upgrade.\n\n"
                      "Please report this bug against the 'update-manager' "
-                     "package and include the following error message:\n") + e
+                     "package and include the following error message:\n") + str(e)
             self.start_error(header, desc)
 
         self.unity.set_updates_count(self.cache.install_count)