Merge lp:~xnox/ubuntu/focal/apport/apport-on-powerpc-crashes-subiquity-during-crash-reporting into lp:~ubuntu-core-dev/ubuntu/focal/apport/ubuntu

[Dimitri John Ledkov]

* data/general-hooks/powerpc.py: Hande reports without a package, such as against subiquity snap, otherwise the hook crashes subiquity, which is trying to generate a crash report. LP: #1871434

[Dimitri John Ledkov (xnox)]

https://paste.ubuntu.com/p/mPCJJGNDPh/ diff failed to calculate

[lp:~xnox/ubuntu/focal/apport/apport-on-powerpc-crashes-subiquity-during-crash-reporting]

2764. By Dimitri John Ledkov on 2020-04-07

data/package-hooks/subiquity.py: Fix typpo in subiquity hook, readline
from fp, not from filename.

[Brian Murray (brian-murray)]

Looks good to me thanks.

review: Approve

=== modified file 'data/general-hooks/powerpc.py'
--- data/general-hooks/powerpc.py	2016-01-13 01:06:27 +0000
+++ data/general-hooks/powerpc.py	2020-04-07 18:06:25 +0000
@@ -39,7 +39,7 @@
     if arch not in ['ppc64', 'ppc64le']:
         return
 
-    is_kernel = report['ProblemType'].startswith('Kernel') or 'linux' in report.get('Package')
+    is_kernel = report['ProblemType'].startswith('Kernel') or 'linux' in report.get('Package', '')
 
     try:
         with open('/proc/cpuinfo', 'r') as fp:
 
=== modified file 'data/package-hooks/subiquity.py'
--- data/package-hooks/subiquity.py	2020-04-02 20:19:19 +0000
+++ data/package-hooks/subiquity.py	2020-04-07 18:06:25 +0000
@@ -14,7 +14,7 @@
     if os.path.exists(logfile):
         hookutils.attach_file(report, 'logfile', 'InstallerLog')
         with open(logfile) as fp:
-            first_line = logfile.readline()
+            first_line = fp.readline()
         marker = 'Starting Subiquity revision'
         if marker in first_line:
             revision = first_line.split(marker)[1].strip()
 
=== modified file 'debian/changelog'
--- debian/changelog	2020-04-06 18:22:58 +0000
+++ debian/changelog	2020-04-07 18:06:25 +0000
@@ -1,7 +1,15 @@
 apport (2.20.11-0ubuntu25) UNRELEASED; urgency=medium
 
+  [ Brian Murray ]
   * apport/hookutils.py: Add in "lspci -vt" output for the HWE team.
 
+  [ Dimitri John Ledkov ]
+  * data/general-hooks/powerpc.py: Hande reports without a package, such
+    as against subiquity snap, otherwise the hook crashes subiquity, which
+    is trying to generate a crash report. LP: #1871434
+  * data/package-hooks/subiquity.py: Fix typpo in subiquity hook, readline
+    from fp, not from filename.
+
  -- Brian Murray <[e-mail]>  Mon, 06 Apr 2020 11:21:40 -0700
 
 apport (2.20.11-0ubuntu24) focal; urgency=medium