Ubuntu
apport package

Merge ~ubuntu-core-dev/ubuntu/+source/apport:subiquity-desktop-details into ~ubuntu-core-dev/ubuntu/+source/apport:ubuntu/devel

  1. Git
  2. lp:~ubuntu-core-dev/ubuntu/+source/apport
  3. subiquity-desktop-details
  4. Merge into ubuntu/devel
Proposed by Sebastien Bacher
Status: Merged
Merge reported by: Benjamin Drung
Merged at revision: e26a9ca238705ca239d15c8f2e7883f8d47a2857
Proposed branch: ~ubuntu-core-dev/ubuntu/+source/apport:subiquity-desktop-details
Merge into: ~ubuntu-core-dev/ubuntu/+source/apport:ubuntu/devel
Diff against target: 45 lines (+13/-4)
1 file modified
debian/patches/Add-package-hooks.patch (+13/-4)
Reviewer Review Type Date Requested Status
Benjamin Drung Approve
Review via email: mp+440270@code.launchpad.net

Description of the change

The new desktop installer use subiquity as a backend so let's collect also the frontend log if available, record the revision of the snap in use and tag in a way that let us filter the desktop reports

To post a comment you must log in.
Revision history for this message
Benjamin Drung (bdrung) wrote :

Can you use "gbp pq" to modify/update the patch (to reduce the diff size)?

review: Needs Fixing
Revision history for this message
Benjamin Drung (bdrung) :
review: Needs Fixing
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks, I've refreshed the patch using gbp pq and modified the code to use report.add_tags. I've force pushed an amended version of the commit since launchpad has no squash option and it should make things cleaner

Revision history for this message
Benjamin Drung (bdrung) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/patches/Add-package-hooks.patch b/debian/patches/Add-package-hooks.patch
2index 894c64f..d1aaf12 100644
3--- a/debian/patches/Add-package-hooks.patch
4+++ b/debian/patches/Add-package-hooks.patch
5@@ -7,9 +7,9 @@ Forwarded: not-needed
6 data/package-hooks/source_debian-installer.py | 74 +++++++++
7 data/package-hooks/source_linux.py | 165 +++++++++++++++++++
8 data/package-hooks/source_ubiquity.py | 219 +++++++++++++++++++++++++
9- data/package-hooks/subiquity.py | 43 +++++
10+ data/package-hooks/subiquity.py | 52 ++++++
11 data/package-hooks/ubuntu-desktop-installer.py | 46 ++++++
12- 5 files changed, 547 insertions(+)
13+ 5 files changed, 556 insertions(+)
14 create mode 100644 data/package-hooks/source_debian-installer.py
15 create mode 100644 data/package-hooks/source_linux.py
16 create mode 100644 data/package-hooks/source_ubiquity.py
17@@ -494,10 +494,10 @@ index 0000000..8a5b8aa
18 + report["Tags"] += " oem-config"
19 diff --git a/data/package-hooks/subiquity.py b/data/package-hooks/subiquity.py
20 new file mode 100644
21-index 0000000..c99ccb6
22+index 0000000..32f0797
23 --- /dev/null
24 +++ b/data/package-hooks/subiquity.py
25-@@ -0,0 +1,43 @@
26+@@ -0,0 +1,52 @@
27 +"""Send reports about subiquity to the correct Launchpad project."""
28 +import os
29 +
30@@ -541,6 +541,15 @@ index 0000000..c99ccb6
31 + hookutils.attach_file_if_exists(
32 + report, "/var/log/installer/block/probe-data.json", "ProbeData"
33 + )
34++
35++ # collect desktop installer details if available
36++ desktoplog = os.path.realpath("/var/log/installer/ubuntu_desktop_installer.log")
37++ if os.path.exists(desktoplog):
38++ hookutils.attach_file(report, desktoplog, "DesktopInstallerLog")
39++ report.add_tags(["ubuntu-desktop-installer"])
40++ snapdir = os.path.realpath("/snap/ubuntu-desktop-installer/current")
41++ if os.path.exists(snapdir):
42++ report["DesktopInstallerRev"]= os.path.basename(snapdir)
43 diff --git a/data/package-hooks/ubuntu-desktop-installer.py b/data/package-hooks/ubuntu-desktop-installer.py
44 new file mode 100644
45 index 0000000..3a20f0d

Subscribers

People subscribed via source and target branches