Chromium Browser

Merge lp:~chromium-team/chromium-browser/update-apport-hook into lp:~chromium-team/chromium-browser/groovy-stable

  1. update-apport-hook
  2. Merge into groovy-stable
Proposed by Olivier Tilloy
Status: Merged
Approved by: Nathan Teodosio
Approved revision: 1554
Merged at revision: 1554
Proposed branch: lp:~chromium-team/chromium-browser/update-apport-hook
Merge into: lp:~chromium-team/chromium-browser/groovy-stable
Diff against target: 51 lines (+17/-2)
2 files modified
debian/apport/chromium-browser.py (+10/-2)
debian/changelog (+7/-0)
To merge this branch: bzr merge lp:~chromium-team/chromium-browser/update-apport-hook
Reviewer Review Type Date Requested Status
Nathan Teodosio Approve
Review via email: mp+431683@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Olivier Tilloy (osomon) wrote :

Note: this is targetting the groovy-stable branch, because branches weren't created for later releases, but it should be cherry-picked to the packages in focal, jammy and kinetic.

Revision history for this message
Nathan Teodosio (nteodosio) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/apport/chromium-browser.py'
2--- debian/apport/chromium-browser.py 2020-10-16 16:48:41 +0000
3+++ debian/apport/chromium-browser.py 2022-10-17 17:08:29 +0000
4@@ -3,7 +3,7 @@
5 /usr/share/apport/package-hooks/chromium-browser.py
6
7 Copyright (c) 2010, Fabien Tassin <fta@sofaraway.org>
8-Copyright (c) 2014-2019, Canonical
9+Copyright (c) 2014-2022, Canonical
10
11 This program is free software; you can redistribute it and/or modify it
12 under the terms of the GNU General Public License as published by the
13@@ -20,6 +20,7 @@
14 import apport.hookutils
15
16
17+SNAP_META = '/snap/chromium/current/meta/snap.yaml'
18 SNAP_USER_COMMON = os.path.expanduser('~/snap/chromium/common')
19 SNAP_USER_DATA = os.path.expanduser('~/snap/chromium/current')
20
21@@ -57,7 +58,14 @@
22
23
24 def add_info(report, hookui):
25- for snap in ['core', 'core18', 'chromium', 'gtk-common-themes']:
26+ snaps = set(['core', 'core20', 'chromium'])
27+ with open(SNAP_META, 'r') as f:
28+ for line in f.readlines():
29+ line = line.strip()
30+ if line.startswith('default-provider:'):
31+ snaps.add(line.split(':')[-1].strip())
32+
33+ for snap in snaps:
34 report['Snap.Info.{}'.format(snap)] = \
35 run_cmd(['snap', 'info', '--abs-time', snap])
36
37
38=== modified file 'debian/changelog'
39--- debian/changelog 2020-10-16 16:49:06 +0000
40+++ debian/changelog 2022-10-17 17:08:29 +0000
41@@ -1,3 +1,10 @@
42+chromium-browser (1:85.0.4183.83-0ubuntu3) UNRELEASED; urgency=medium
43+
44+ * debian/apport/chromium-browser.py: update the apport hook to collect
45+ up-to-date information from the chromium snap (LP: #1993191)
46+
47+ -- Olivier Tilloy <olivier.tilloy@canonical.com> Mon, 17 Oct 2022 18:53:30 +0200
48+
49 chromium-browser (1:85.0.4183.83-0ubuntu2) groovy; urgency=medium
50
51 [ Sébastien Bacher ]

Subscribers

People subscribed via source and target branches

to all changes: