Merge lp:~jibel/ubuntu/bionic/apport/lp1582950_2_ubiquity_hook into lp:~ubuntu-core-dev/ubuntu/bionic/apport/ubuntu

[Jean-Baptiste Lallement]

source_ubiquity.py: Convert attachments to string when it is necessary.

[Brian Murray (brian-murray)]

Thanks for working on this. I believe isinstance() is preferred to using type().

https://docs.python.org/3/library/functions.html#type

Did you test this with both scenarios outlined in the bug?

review: Needs Fixing

[lp:~jibel/ubuntu/bionic/apport/lp1582950_2_ubiquity_hook]

2604. By Jean-Baptiste Lallement on 2018-01-30

source_ubiquity.py: Use isinstance() instead of type()

[Jean-Baptiste Lallement (jibel)]

Thanks for your review.

I changed the code to use isinstance()

I tested on bionic on a live session and an installed system as user and as root with sudo and the hook did not crash while it is crashing without the patch.

=== modified file 'data/package-hooks/source_ubiquity.py'
--- data/package-hooks/source_ubiquity.py	2017-09-27 17:55:28 +0000
+++ data/package-hooks/source_ubiquity.py	2018-01-30 09:11:12 +0000
@@ -26,6 +26,12 @@
     elif os.path.exists(f):
         apport.hookutils.attach_root_command_outputs(report, {ident: "cat '%s'" % f})
 
+    if isinstance(report[ident], bytes):
+        try:
+            report[ident] = report[ident].decode('UTF-8', 'replace')
+        except UnicodeDecodeError:
+            pass
+
 
 def prepare_duplicate_signature(syslog, collect_grub, collect_trace):
     collect = ''
@@ -57,7 +63,7 @@
 
 def add_info(report, ui):
     add_installation_log(report, 'UbiquitySyslog', 'syslog')
-    syslog = report['UbiquitySyslog'].decode('utf-8', 'ignore')
+    syslog = report['UbiquitySyslog']
     if 'Buffer I/O error on device' in syslog:
         if re.search('Attached .* CD-ROM (\w+)', syslog):
             cd_drive = re.search('Attached .* CD-ROM (\w+)', syslog).group(1)