Merge ~mwhudson/ubuntu/+source/apport:subiquity-hook into ubuntu/+source/apport:ubuntu/focal-proposed

[Michael Hudson-Doyle]

dc4922c... by Michael Hudson-Doyle on 2020-04-01

add changelog

[Michael Hudson-Doyle (mwhudson)]

Haven't tested this, the package does at least build though.

[Brian Murray (brian-murray)]

Apport is still using bzr and I've manually merged this.

https://bazaar.launchpad.net/~ubuntu-core-dev/ubuntu/focal/apport/ubuntu/revision/2758

review: Disapprove

Unmerged commits

dc4922c... by Michael Hudson-Doyle on 2020-04-01

add changelog

9033b71... by Michael Hudson-Doyle on 2020-04-01

one more file

b124881... by Michael Hudson-Doyle on 2020-04-01

add a hook for subiquity

0cf82a4... by Brian Murray on 2020-03-12

Import patches-unapplied version 2.20.11-0ubuntu21 to ubuntu/focal-proposed

Imported using git-ubuntu import.

Changelog parent: bda6839ae07b0fecfb01292a5a553ac9f94799b9

New changelog entries:
  [ Brian Murray ]
  * backends/packaging-apt-dpkg.py: allow mirrors which are accessed via https
    in sources.list. Thanks to Launchpad user Esokrates for the fix.
    (LP: #1866996)
  * backends/packaging-apt-dpkg.py: when downloading packages from Launchpad
    do not require them to be authenticated.
  * test/test_backend_apt_dpkg.py: Fix check for connectivity and modify
    install from PPA test for a change in the PPA being tested.
  [ Matthieu Clemenceau ]
  * test/test_ui.py: Removed linux package version to fix autopkgtest with
    focal. Changed linux-5.4 and linux-signed-5.4 to linux and linux-signed

bda6839... by Brian Murray on 2020-03-10

Import patches-unapplied version 2.20.11-0ubuntu20 to ubuntu/focal-proposed

Imported using git-ubuntu import.

Changelog parent: b4476242bf0f24abd8063b3685f9bda01ef39006

New changelog entries:
  * test/test_report.py: resolve test failure with new glibc output.

b447624... by Brian Murray on 2020-03-09

Import patches-unapplied version 2.20.11-0ubuntu19 to ubuntu/focal-proposed

Imported using git-ubuntu import.

Changelog parent: 1ff0a79fe31bcbfe416ef9976daec9e58b0a6ff3

New changelog entries:
  * apport/report.py: do not return a duplicate signature when we are unable
    to access ProcMaps as that is necessary to create one. (LP: #1866347)
  * apport/ui.py: Always allow users to use ubuntu-bug or apport-collect
    regardless of the Problem Reporting setting as they are manually invoked
    and not automatically generated like a crash report. (LP: #1814611)

1ff0a79... by Brian Murray on 2020-02-22

Import patches-unapplied version 2.20.11-0ubuntu18 to ubuntu/focal-proposed

Imported using git-ubuntu import.

Changelog parent: b83e23763f17f40407ba90f082b6bfff94336166

New changelog entries:
  * data/whoopsie-upload-all: append to the crash report using fdopen and open
    from os to cope with protected_regular being set to 1. (LP: #1848064)

b83e237... by Brian Murray on 2020-02-21

Import patches-unapplied version 2.20.11-0ubuntu17 to ubuntu/focal-proposed

Imported using git-ubuntu import.

Changelog parent: b45889378cb6b446e01c58863c445b23070efefc

New changelog entries:
  [ Brian Murray ]
  * Add in a source package hook symlinks for linux-signed-5.4,
    linux-signed-oem-5.4, linux-oem-5.4, and linux-5.4. (LP: #1861446)
  * Remove obsolete package hook for Nexus 7 devices.
  [ Tiago Stürmer Daitx ]
  * Fix Python 2/3 support. (LP: #1853383)

b458893... by =?utf-8?q?Tiago_St=C3=BCrmer_Daitx?= <email address hidden> on 2020-01-06

Import patches-unapplied version 2.20.11-0ubuntu16 to ubuntu/focal-proposed

Imported using git-ubuntu import.

Changelog parent: 786f607c01f3b9e7dd7a7d0f99176154ec114b58

New changelog entries:
  * SECURITY REGRESSION: 'module' object has no attribute 'O_PATH'
    (LP: #1851806)
    - apport/report.py, apport/ui.py: use file descriptors for /proc/pid
      directory access only when running under python 3; prevent reading /proc
      maps under python 2 as it does not provide a secure way to do so; use
      io.open for better compatibility between python 2 and 3.
  * data/apport: fix number of arguments passed through socks into a container.
  * test/test_report.py: test login session with both pid and proc_pid_fd.

786f607... by Brian Murray on 2019-12-20

Import patches-unapplied version 2.20.11-0ubuntu15 to ubuntu/focal-proposed

Imported using git-ubuntu import.

Changelog parent: e2c1efb3538c5ab86bae6b9c2ebe3212652446f9

New changelog entries:
   * etc/apport/crashdb.conf: Enable Launchpad crash reports for focal.

diff --git a/data/package-hooks/subiquity.py b/data/package-hooks/subiquity.py
new file mode 100644
index 0000000..caffe28
--- /dev/null
+++ b/data/package-hooks/subiquity.py
@@ -0,0 +1,42 @@
+'''
+Send reports about subiquity to the correct Launchpad project.
+
+'''
+import os
+
+from apport import hookutils
+
+
+def add_info(report, ui):
+    # TODO: read the version from the log file?
+    logfile = os.path.realpath('/var/log/installer/subiquity-debug.log')
+    revision = 'unknown'
+    if os.path.exists(logfile):
+        hookutils.attach_file(report, 'logfile', 'InstallerLog')
+        with open(logfile) as fp:
+            first_line = logfile.readline()
+        marker = 'Starting Subiquity revision'
+        if marker in first_line:
+            revision = first_line.split(marker)[1].strip()
+    report['Package'] = 'subiquity ({})'.format(revision)
+    report['SourcePackage'] = 'subiquity'
+    # rewrite this section so the report goes to the project in Launchpad
+    report['CrashDB'] = '''{
+       "impl": "launchpad",
+       "project": "subiquity",
+       "bug_pattern_url": "http://people.canonical.com/~ubuntu-archive/bugpatterns/bugpatterns.xml"
+    }'''
+
+    # add in subiquity stuff
+    hookutils.attach_file_if_exists(
+        report,
+        '/var/log/installer/subiquity-curtin-install.conf',
+        'CurtinConfig')
+    hookutils.attach_file_if_exists(
+        report,
+        '/var/log/installer/curtin-install.log',
+        'CurtinLog')
+    hookutils.attach_file_if_exists(
+        report,
+        '/var/log/installer/block/probe-data.json',
+        'ProbeData')
diff --git a/debian/changelog b/debian/changelog
index 09efa81..5246552 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apport (2.20.11-0ubuntu22) UNRELEASED; urgency=medium
+
+  * Add a package hook to allow subiquity problems to be reported from the
+    installed system. 
+
+ -- Michael Hudson-Doyle <[e-mail]>  Wed, 01 Apr 2020 16:24:54 +1300
+
 apport (2.20.11-0ubuntu21) focal; urgency=medium
 
   [ Brian Murray ]