Merge lp:~brian-murray/aptdaemon/package-version-in-crash into lp:aptdaemon

[Brian Murray]

See the related bug.

[Michael Vogt (mvo)]

This looks good, thanks. The change in gtk3widgets is unreleated I will exclude that.

review: Approve

=== modified file 'aptdaemon/crash.py'
--- aptdaemon/crash.py	2012-12-29 15:19:44 +0000
+++ aptdaemon/crash.py	2014-05-30 09:30:33 +0000
@@ -43,7 +43,13 @@
     uid = 0
     report = apport.Report("Crash")
     report["Title"] = error
-    report["Package"] = "aptdaemon"
+    package = "aptdaemon"
+    try:
+        package_version = apport.packaging.get_version(package)
+    except ValueError as e:
+        if 'does not exist' in e.message:
+            package_version = 'unknown'
+    report['Package'] = '%s %s' % (package, package_version)
     report["SourcePackage"] = "aptdaemon"
     report["Traceback"] = traceback
     report["ExecutablePath"] = "/usr/sbin/aptd"
 
=== modified file 'aptdaemon/gtk3widgets.py'
--- aptdaemon/gtk3widgets.py	2013-12-03 10:16:52 +0000
+++ aptdaemon/gtk3widgets.py	2014-05-30 09:30:33 +0000
@@ -520,6 +520,8 @@
             text += get_download_status_from_enum(status)
         text += "</small>"
         model = self.get_model()
+        if not model:
+            return
         try:
             iter = self._download_map[uri]
         except KeyError: