Ubuntu
apport package

Merge ~ubuntu-core-dev/ubuntu/+source/apport:subiquity-desktop-details into 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: Superseded
Proposed branch: ~ubuntu-core-dev/ubuntu/+source/apport:subiquity-desktop-details
Merge into: ubuntu/+source/apport:ubuntu/devel
Diff against target: 125 lines (+49/-0) (has conflicts)
2 files modified
.gitignore (+4/-0)
debian/patches/Add-package-hooks.patch (+45/-0)
Conflict in .gitignore
Conflict in debian/patches/Add-package-hooks.patch
Reviewer Review Type Date Requested Status
Benjamin Drung Pending
Review via email: mp+440269@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.

Unmerged commits

59609f0... by Sebastien Bacher

Let subiquity collect the desktop installer details if available

5651da1... by Benjamin Drung

Release apport 2.26.0-0ubuntu2

Signed-off-by: Benjamin Drung <email address hidden>

93c68c6... by Benjamin Drung

fix: Mock query to Github in integration test

Autopkgtests fail otherwise because they cannot reach Github.

Forwarded: https://github.com/canonical/apport/pull/140

2b037bc... by Benjamin Drung

Release apport 2.26.0-0ubuntu1

Signed-off-by: Benjamin Drung <email address hidden>

cd34dae... by Benjamin Drung

Depend on python3-requests for GitHub crash DB backend

Signed-off-by: Benjamin Drung <email address hidden>

48d0b38... by Benjamin Drung

Run wrap-and-sort -st

Signed-off-by: Benjamin Drung <email address hidden>

e24be41... by Benjamin Drung

Refresh patches

Signed-off-by: Benjamin Drung <email address hidden>

8e2899f... by Benjamin Drung

Drop cherry-picked upstream patches

Signed-off-by: Benjamin Drung <email address hidden>

1255a30... by Benjamin Drung

Merge tag '2.26.0' into ubuntu/devel

e6a2a07... by Benjamin Drung

Release apport 2.26.0

Signed-off-by: Benjamin Drung <email address hidden>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/.gitignore b/.gitignore
2index c2e6ac9..32d7cc8 100644
3--- a/.gitignore
4+++ b/.gitignore
5@@ -5,6 +5,10 @@ MANIFEST
6 __pycache__
7 apport/packaging_impl.py
8 build
9+<<<<<<< .gitignore
10+=======
11+debhelper/dh_apport.1
12+>>>>>>> .gitignore
13 dist
14 doc/*.aux
15 doc/*.log
16diff --git a/debian/patches/Add-package-hooks.patch b/debian/patches/Add-package-hooks.patch
17index 894c64f..839b767 100644
18--- a/debian/patches/Add-package-hooks.patch
19+++ b/debian/patches/Add-package-hooks.patch
20@@ -16,11 +16,18 @@ Forwarded: not-needed
21 create mode 100644 data/package-hooks/subiquity.py
22 create mode 100644 data/package-hooks/ubuntu-desktop-installer.py
23
24+<<<<<<< debian/patches/Add-package-hooks.patch
25 diff --git a/data/package-hooks/source_debian-installer.py b/data/package-hooks/source_debian-installer.py
26 new file mode 100644
27 index 0000000..82f9a20
28 --- /dev/null
29 +++ b/data/package-hooks/source_debian-installer.py
30+=======
31+Index: apport/data/package-hooks/source_debian-installer.py
32+===================================================================
33+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
34++++ apport/data/package-hooks/source_debian-installer.py 2023-04-03 21:06:14.103820411 +0200
35+>>>>>>> debian/patches/Add-package-hooks.patch
36 @@ -0,0 +1,74 @@
37 +"""Apport package hook for the Debian installer.
38 +
39@@ -96,11 +103,18 @@ index 0000000..82f9a20
40 +
41 +if __name__ == "__main__":
42 + main()
43+<<<<<<< debian/patches/Add-package-hooks.patch
44 diff --git a/data/package-hooks/source_linux.py b/data/package-hooks/source_linux.py
45 new file mode 100644
46 index 0000000..fbb6fc2
47 --- /dev/null
48 +++ b/data/package-hooks/source_linux.py
49+=======
50+Index: apport/data/package-hooks/source_linux.py
51+===================================================================
52+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
53++++ apport/data/package-hooks/source_linux.py 2023-04-03 21:06:14.103820411 +0200
54+>>>>>>> debian/patches/Add-package-hooks.patch
55 @@ -0,0 +1,165 @@
56 +"""Apport package hook for the Linux kernel.
57 +
58@@ -267,11 +281,18 @@ index 0000000..fbb6fc2
59 + add_info(r, None)
60 + for k, v in r.items():
61 + print("%s: %s" % (k, v))
62+<<<<<<< debian/patches/Add-package-hooks.patch
63 diff --git a/data/package-hooks/source_ubiquity.py b/data/package-hooks/source_ubiquity.py
64 new file mode 100644
65 index 0000000..8a5b8aa
66 --- /dev/null
67 +++ b/data/package-hooks/source_ubiquity.py
68+=======
69+Index: apport/data/package-hooks/source_ubiquity.py
70+===================================================================
71+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
72++++ apport/data/package-hooks/source_ubiquity.py 2023-04-03 21:06:14.103820411 +0200
73+>>>>>>> debian/patches/Add-package-hooks.patch
74 @@ -0,0 +1,219 @@
75 +"""Apport package hook for the ubiquity live CD installer.
76 +
77@@ -492,12 +513,20 @@ index 0000000..8a5b8aa
78 + add_installation_log(report, "OemConfigLog", "oem-config.log")
79 + if "OemConfigLog" in report:
80 + report["Tags"] += " oem-config"
81+<<<<<<< debian/patches/Add-package-hooks.patch
82 diff --git a/data/package-hooks/subiquity.py b/data/package-hooks/subiquity.py
83 new file mode 100644
84 index 0000000..c99ccb6
85 --- /dev/null
86 +++ b/data/package-hooks/subiquity.py
87 @@ -0,0 +1,43 @@
88+=======
89+Index: apport/data/package-hooks/subiquity.py
90+===================================================================
91+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
92++++ apport/data/package-hooks/subiquity.py 2023-04-03 21:06:37.143462505 +0200
93+@@ -0,0 +1,52 @@
94+>>>>>>> debian/patches/Add-package-hooks.patch
95 +"""Send reports about subiquity to the correct Launchpad project."""
96 +import os
97 +
98@@ -541,11 +570,27 @@ index 0000000..c99ccb6
99 + hookutils.attach_file_if_exists(
100 + report, "/var/log/installer/block/probe-data.json", "ProbeData"
101 + )
102+<<<<<<< debian/patches/Add-package-hooks.patch
103 diff --git a/data/package-hooks/ubuntu-desktop-installer.py b/data/package-hooks/ubuntu-desktop-installer.py
104 new file mode 100644
105 index 0000000..3a20f0d
106 --- /dev/null
107 +++ b/data/package-hooks/ubuntu-desktop-installer.py
108+=======
109++
110++ # collect desktop installer details if available
111++ desktoplog = os.path.realpath("/var/log/installer/ubuntu_desktop_installer.log")
112++ if os.path.exists(desktoplog):
113++ hookutils.attach_file(report, desktoplog, "DesktopInstallerLog")
114++ report["Tags"] += " ubuntu-desktop-installer"
115++ snapdir = os.path.realpath("/snap/ubuntu-desktop-installer/current")
116++ if os.path.exists(snapdir):
117++ report["DesktopInstallerRev"]= os.path.basename(snapdir)
118+Index: apport/data/package-hooks/ubuntu-desktop-installer.py
119+===================================================================
120+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
121++++ apport/data/package-hooks/ubuntu-desktop-installer.py 2023-04-03 21:06:14.103820411 +0200
122+>>>>>>> debian/patches/Add-package-hooks.patch
123 @@ -0,0 +1,46 @@
124 +"""Send reports about ubuntu-desktop-installer to the correct Launchpad
125 +project."""

Subscribers

People subscribed via source and target branches