Merge ~osomon/ubiquity:impish-release-notes-hyperlink-1945015 into ubiquity:master

Proposed by Olivier Tilloy
Status: Merged
Merged at revision: ac54168cc0cba8aabc7e7c3e9fd74afad6cccf68
Proposed branch: ~osomon/ubiquity:impish-release-notes-hyperlink-1945015
Merge into: ubiquity:master
Diff against target: 62 lines (+11/-5)
4 files modified
debian/changelog (+8/-0)
debian/control (+1/-1)
ubiquity/frontend/gtk_ui.py (+1/-3)
ubiquity/misc.py (+1/-1)
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Dimitri John Ledkov Approve
Review via email: mp+409218@code.launchpad.net

Commit message

Use xdg-open instead of sensible-browser to open the release notes and other hyperlinks consistently (LP: #1945015).

To post a comment you must log in.
Revision history for this message
Dimitri John Ledkov (xnox) :
review: Approve
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

If any flavours fail to work with xdg-open, they must be fixed as supporting xdg-open is a must for many years now.

Revision history for this message
Sebastien Bacher (seb128) wrote :

Sounds sensible to me but I'm not part of the ubiquity team to change the status

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 41af5b7..9dbcf4d 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,11 @@
6+ubiquity (21.10.6) UNRELEASED; urgency=medium
7+
8+ * ubiquity/frontend/gtk_ui.py, ubiquity/misc.py, debian/control: use
9+ xdg-open instead of sensible-browser to open the release notes and
10+ other hyperlinks consistently (LP: #1945015)
11+
12+ -- Olivier Tilloy <olivier.tilloy@canonical.com> Mon, 27 Sep 2021 15:14:25 +0200
13+
14 ubiquity (21.10.5) impish; urgency=medium
15
16 * tests/test_gtkwidgets.py, ubiquity/frontend/gtk_ui.py:
17diff --git a/debian/control b/debian/control
18index 273c97f..70a46d8 100644
19--- a/debian/control
20+++ b/debian/control
21@@ -99,6 +99,7 @@ Depends: adduser,
22 ubiquity-casper,
23 ubiquity-frontend-${mangled-version},
24 wget,
25+ xdg-utils,
26 dctrl-tools,
27 ${console-setup-depends},
28 ${misc:Depends},
29@@ -144,7 +145,6 @@ Depends: busybox-static | busybox,
30 python3-dbus,
31 python3-gi,
32 python3-gi-cairo,
33- sensible-utils,
34 ubiquity (= ${binary:Version}),
35 ${misc:Depends},
36 ${python3:Depends},
37diff --git a/ubiquity/frontend/gtk_ui.py b/ubiquity/frontend/gtk_ui.py
38index e78ef33..77e0cde 100644
39--- a/ubiquity/frontend/gtk_ui.py
40+++ b/ubiquity/frontend/gtk_ui.py
41@@ -964,9 +964,7 @@ class Wizard(BaseFrontend):
42 request = decision.get_request()
43 uri = request.get_uri()
44 decision.ignore()
45- subprocess.Popen(['sensible-browser', uri],
46- close_fds=True,
47- preexec_fn=misc.drop_all_privileges)
48+ misc.launch_uri(uri)
49 return True
50 return False
51
52diff --git a/ubiquity/misc.py b/ubiquity/misc.py
53index 86dbdbd..bc88d5d 100644
54--- a/ubiquity/misc.py
55+++ b/ubiquity/misc.py
56@@ -962,7 +962,7 @@ min_install_size = None
57
58
59 def launch_uri(uri):
60- subprocess.Popen(['sensible-browser', uri], close_fds=True,
61+ subprocess.Popen(['xdg-open', uri], close_fds=True,
62 preexec_fn=drop_all_privileges)
63
64

Subscribers

People subscribed via source and target branches