Merge ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-livepatch-privacy-url-from-etc-os-release into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master

Proposed by Andrea Azzarone on 2018-11-19
Status: Merged
Merged at revision: 55eddd6995800b78b2daa7818731d555da270055
Proposed branch: ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-livepatch-privacy-url-from-etc-os-release
Merge into: ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master
Diff against target: 67 lines (+17/-5)
2 files modified
debian/changelog (+7/-0)
debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch (+10/-5)
Reviewer Review Type Date Requested Status
Sebastien Bacher 2018-11-19 Approve on 2018-12-18
Review via email: mp+359004@code.launchpad.net
To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

Thank you for your bug report. Is there a report about that? What's the rational to point to another page than the one previously used?

review: Needs Information
Andrea Azzarone (azzar1) wrote :

> Thank you for your bug report. Is there a report about that? What's the
> rational to point to another page than the one previously used?

There is no bug report but I can create it if needed. It's the same page but we get it from /etc/os-release as we do in other parts.

Sebastien Bacher (seb128) wrote :

We removed the code to parse os-relase no? (since the "what is being reported to Canonical" info is different from a legal notice). In any case, if Will confirms it's the right page go for it

Andrea Azzarone (azzar1) wrote :

> We removed the code to parse os-relase no? (since the "what is being reported
> to Canonical" info is different from a legal notice)

That was for the report page.

In any case, if Will confirms it's the right page go for it

The livepatch page should point out to the link in /etc/os-release. Will agreed on /etc/os-release in irc.

Will Cooke (willcooke) wrote :

The correct policy for __Livepatch__ is: https://www.ubuntu.com/legal/data-privacy
The "PRIVACY_POLICY_URL" in /etc/os-release does indeed point to that page.
Therefore +1.

Note the Ubuntu Report page must still point to the other policy at https://www.ubuntu.com/legal/systems-information-notice. This patch does not touch that and Seb already fixed it.

Sebastien Bacher (seb128) wrote :

K, fine, let's merge that then :)

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 64201c2..3a5dc35 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+gnome-initial-setup (3.30.0-1ubuntu5) UNRELEASED; urgency=medium
7+
8+ * debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch:
9+ - Use privacy URL from /etc/os-release in Livepatch page.
10+
11+ -- Andrea Azzarone <andrea.azzarone@canonical.com> Mon, 19 Nov 2018 18:08:23 +0000
12+
13 gnome-initial-setup (3.30.0-1ubuntu4) disco; urgency=medium
14
15 * debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch:
16diff --git a/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch b/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch
17index ee1033e..3271d3a 100644
18--- a/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch
19+++ b/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch
20@@ -26,7 +26,7 @@ Subject: Add Ubuntu mode with special pages
21 .../pages/livepatch/gis-auth-dialog.c | 528 ++++++++++++++++++++
22 .../pages/livepatch/gis-auth-dialog.h | 40 ++
23 .../pages/livepatch/gis-auth-dialog.ui | 231 +++++++++
24- .../pages/livepatch/gis-livepatch-page.c | 533 +++++++++++++++++++++
25+ .../pages/livepatch/gis-livepatch-page.c | 538 +++++++++++++++++++++
26 .../pages/livepatch/gis-livepatch-page.h | 52 ++
27 .../pages/livepatch/gis-livepatch-page.ui | 156 ++++++
28 .../pages/livepatch/livepatch.gresource.xml | 9 +
29@@ -44,7 +44,7 @@ Subject: Add Ubuntu mode with special pages
30 .../pages/ubuntu-report/ubuntu-report.svg | 1 +
31 meson.build | 3 +
32 po/POTFILES.in | 12 +
33- 41 files changed, 2969 insertions(+), 7 deletions(-)
34+ 41 files changed, 2974 insertions(+), 7 deletions(-)
35 create mode 100644 data/com.ubuntu.welcome.policy.in
36 create mode 100644 data/its/polkit.its
37 create mode 100644 data/its/polkit.loc
38@@ -2025,10 +2025,10 @@ index 0000000..2f3c742
39 +</interface>
40 diff --git a/gnome-initial-setup/pages/livepatch/gis-livepatch-page.c b/gnome-initial-setup/pages/livepatch/gis-livepatch-page.c
41 new file mode 100644
42-index 0000000..e604819
43+index 0000000..eab2fb6
44 --- /dev/null
45 +++ b/gnome-initial-setup/pages/livepatch/gis-livepatch-page.c
46-@@ -0,0 +1,533 @@
47+@@ -0,0 +1,538 @@
48 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
49 +/*
50 + * Copyright (C) 2018 Canonical Ltd.
51@@ -2452,10 +2452,15 @@ index 0000000..e604819
52 +static void
53 +show_legal (GtkButton *button, GisLivepatchPage *page)
54 +{
55++ g_autofree gchar *buffer = NULL;
56++ g_autofree gchar *privacy_policy = NULL;
57 + g_autoptr(GError) error = NULL;
58 +
59++ if (g_file_get_contents ("/etc/os-release", &buffer, NULL, NULL))
60++ privacy_policy = get_item (buffer, "PRIVACY_POLICY_URL");
61++
62 + if (!gtk_show_uri_on_window (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (page))),
63-+ "https://www.ubuntu.com/legal/terms-and-policies/systems-information-notice",
64++ privacy_policy,
65 + GDK_CURRENT_TIME, &error)) {
66 + GtkWidget *dialog;
67 + dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (page))),

Subscribers

People subscribed via source and target branches