Merge lp:~didrocks/apport/handle-older-reports into lp:~apport-hackers/apport/trunk

[Didier Roche-Tolomelli]

Handle older reports without the remember key.

Old reports (generated pre-apport 2.20.10-0ubuntu4) may not have the remember key
and can be loaded afterwards (or after dist-upgrade), and thus, trigger a KeyError.
Consider it as false then.
Use try/expect for python2 support.
Fixes LP: #1791324

[Julian Andres Klode (juliank)]

Would be cleaner with response.get('remember', False) IMO to avoid catching KeyErrors inside of self.remember_send_report()

[Didier Roche-Tolomelli (didrocks)]

Both are equivalent (it's not a hot code path), I'm opened to change it if that's preferred.

[Julian Andres Klode (juliank)]

Assuming it's a dict or has a get() method, of course.

[Didier Roche-Tolomelli (didrocks)]

It's a dict when returning from the on demand generated report.

It seems to be a dict when loaded from an old report as well:
"def load(self, file, binary=True, key_filter=None)"
-> If binary is False, binary data is not loaded; the dictionary key is
        created, but its value will be an empty string. If it is True, it is
        transparently uncompressed and available as dictionary byte array values.

[Brian Murray (brian-murray)]

review: Approve

[Didier Roche-Tolomelli (didrocks)]

Brian, I can't merge that, do you mind doing it?

=== modified file 'apport/ui.py'
--- apport/ui.py	2018-06-25 16:23:29 +0000
+++ apport/ui.py	2018-09-11 11:46:47 +0000
@@ -305,8 +305,13 @@
                 self.restart()
             if response['blacklist']:
                 self.report.mark_ignore()
-            if response['remember']:
-                self.remember_send_report(response['report'])
+            try:
+                if response['remember']:
+                    self.remember_send_report(response['report'])
+            # use try/expect for python2 support. Old reports (generated pre-apport 2.20.10-0ubuntu4)
+            # may not have the remember key and can be loaded afterwards (or after dist-upgrade)
+            except KeyError:
+                pass
             if not response['report']:
                 return