Merge ~osomon/software-properties:updates-refresh into software-properties:ubuntu/master

[Olivier Tilloy]

[Didier Roche-Tolomelli (didrocks)]

Here we go: Note that I didn’t test the ppa yet. I have some comments, some suggestions, but apart from my "what if we only have updates" or so, nothing blocking once this one is answered.

Good work!

review: Needs Information

[Olivier Tilloy (osomon)]

Thanks for the review, much appreciated!
I have fixed the "what if we only have updates" case, thanks very much for catching it! I have also applied some suggested changes, and replied inline otherwise.

[Didier Roche-Tolomelli (didrocks)]

The answers and changes look perfect to me! Thanks. I just need to do a testing round and we are good to merge/release :)

[Didier Roche-Tolomelli (didrocks)]

The basic test cases are all working as expected (including the trick "keep backport but disable security" which goes to custom).

If I try to trick by disabling main in the release pocket but keep it for -security (and others), the selection goes to Custom as expected.
Same if I disable main only for the -security pocket, the selection goes to Custom.

However, if I disable universe for the release pocket and disable it as well for -security, the selection goes from "All updates" to "All security updates". It's a little bit misleading because universe is still enabled here for -updates and -backports, I would rather fallback to custom, wdyt?

This is indeed an edge case, but I feel some of our users will fall into it and we should maybe address it?

Otherwise, I didn’t spot anything else, good work!

review: Needs Information

[Didier Roche-Tolomelli (didrocks)]

Another test:
- if you disable main for the release pocket, it select "Custom" -> ack. However, if you then select another option like "All updates", nothing happens -> it’s still on Custom and sources.list isn’t fix

[Olivier Tilloy (osomon)]

I see what's happening here. This code only deals with additional pockets (-updates, -security, -backports, -proposed). It doesn't handle the release pocket.

Does it make sense to have additional pockets enabled while the release pocket isn't? In other words, is this a valid use case?

[Didier Roche-Tolomelli (didrocks)]

I think the use case is valid in the sense that it will be configuration that necessirally some users will have and experience. I think those use case should at least fallback to "Custom" to not show an erronous state.

At least, changing from Custom to another option should "fix" the configuration IMHO

[Olivier Tilloy (osomon)]

That sort of makes sense.
I updated the code to force-enable the release pocket when the previously selected option was "Custom", but that doesn't seem to have an effect. Looks the underlying backend code isn't designed to handle this case. I'll have to dig deeper.

[Olivier Tilloy (osomon)]

I've been playing with this and there doesn't appear to be a clean and reliable way to programatically fix a broken sources.list: force-enabling the release pocket will enable it for certain components (main and restricted I think), but we might still end up in an inconsistent state where another pocket has other components enabled.

The backend code however tells us when there's an inconsistent state, so I would suggest making the combobox insensitive in such cases. This wouldn't allow users to automagically fix their broken sources, but at least it wouldn't give them the wrong impression that they can change their update subscriptions.

What do you think?

[Didier Roche-Tolomelli (didrocks)]

Maybe check with mpt, but I think disabling the widget when it’s in "Custom" and we can’t fix it is a good stop gap solution.

The second side is the wrong detection of broken config (some components disabled in the release pockets, but not on others), do you think you can detect it and display "Custom" for them as well?

[Olivier Tilloy (osomon)]

Note that when some components are inconsistently disabled in e.g. the release pocket, the corresponding checkboxes on the first tab ("Ubuntu Software") should be unchecked.
So in fact the user has a way to fix their sources.list by checking those checkboxes again.

[Didier Roche-Tolomelli (didrocks)]

Ah, good point. Then, I think thus showing the content "upgrade" status is fine and I don’t have any further objections.

Keep me posted about the disabling state and we can merge/ship it then.

[Didier Roche-Tolomelli (didrocks)]

This looks good to me, ready to be released for now! Thanks for the fixes

review: Approve

diff --git a/data/gtkbuilder/main.ui b/data/gtkbuilder/main.ui
index 642e45c..149954b 100644
--- a/data/gtkbuilder/main.ui
+++ b/data/gtkbuilder/main.ui
@@ -8,6 +8,25 @@
       <column type="gchararray"/>
     </columns>
   </object>
+  <object class="GtkListStore" id="model_updates_subscription">
+    <columns>
+      <!-- column-name text -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">All updates</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Security and recommended updates</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Security updates only</col>
+      </row>
+      <!-- a fourth row with translatable label "Custom" is inserted/removed
+           dynamically in the model -->
+    </data>
+  </object>
   <object class="GtkListStore" id="model_normal_updates_display">
     <columns>
       <!-- column-name text -->
@@ -503,74 +522,72 @@
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="vbox8">
+              <object class="GtkVBox">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="border_width">12</property>
                 <property name="spacing">18</property>
                 <child>
-                  <object class="GtkFrame" id="frame_children">
+                  <object class="GtkAlignment">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
+                    <property name="top_padding">6</property>
+                    <property name="left_padding">12</property>
                     <child>
-                      <object class="GtkAlignment" id="alignment7">
+                      <object class="GtkVBox">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="top_padding">6</property>
-                        <property name="left_padding">12</property>
+                        <property name="spacing">6</property>
                         <child>
-                          <object class="GtkVBox" id="vbox_updates">
+                          <object class="GtkHBox">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="spacing">6</property>
                             <child>
-                              <placeholder/>
-                            </child>
-                            <child>
-                              <placeholder/>
+                              <object class="GtkLabel" id="label_updates_1">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">Subscribed to:</property>
+                                <property name="xalign">1</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
                             </child>
                             <child>
-                              <placeholder/>
+                              <object class="GtkComboBox" id="combobox_updates_subscription">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="model">model_updates_subscription</property>
+                                <child>
+                                  <object class="GtkCellRendererText"/>
+                                  <attributes>
+                                    <attribute name="text">0</attribute>
+                                  </attributes>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
                             </child>
                           </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
                         </child>
-                      </object>
-                    </child>
-                    <child type="label">
-                      <object class="GtkLabel" id="label_updates">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Install updates from:</property>
-                        <property name="use_markup">True</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkAlignment" id="alignment2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="top_padding">6</property>
-                    <property name="left_padding">12</property>
-                    <child>
-                      <object class="GtkVBox" id="vbox6">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="spacing">6</property>
                         <child>
-                          <object class="GtkHBox" id="hbox_check_for_updates">
+                          <object class="GtkHBox">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="spacing">6</property>
                             <child>
-                              <object class="GtkLabel" id="label3">
+                              <object class="GtkLabel" id="label_updates_2">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">Automatically check for updates:</property>
@@ -588,7 +605,7 @@
                                 <property name="can_focus">False</property>
                                 <property name="model">model_updates_interval</property>
                                 <child>
-                                  <object class="GtkCellRendererText" id="renderer_updateinterval"/>
+                                  <object class="GtkCellRendererText"/>
                                   <attributes>
                                     <attribute name="text">0</attribute>
                                   </attributes>
@@ -604,16 +621,16 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
-                            <property name="position">0</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkHBox" id="hbox1">
+                          <object class="GtkHBox">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="spacing">6</property>
                             <child>
-                              <object class="GtkLabel" id="label4">
+                              <object class="GtkLabel" id="label_updates_3">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">When there are security updates:</property>
@@ -631,7 +648,7 @@
                                 <property name="can_focus">False</property>
                                 <property name="model">model_security_updates_display_behavior</property>
                                 <child>
-                                  <object class="GtkCellRendererText" id="renderer_securityupdates"/>
+                                  <object class="GtkCellRendererText"/>
                                   <attributes>
                                     <attribute name="text">0</attribute>
                                   </attributes>
@@ -647,16 +664,16 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
-                            <property name="position">1</property>
+                            <property name="position">2</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkHBox" id="hbox2">
+                          <object class="GtkHBox">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="spacing">6</property>
                             <child>
-                              <object class="GtkLabel" id="label5">
+                              <object class="GtkLabel" id="label_updates_4">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">When there are other updates:</property>
@@ -674,7 +691,7 @@
                                 <property name="can_focus">False</property>
                                 <property name="model">model_normal_updates_display</property>
                                 <child>
-                                  <object class="GtkCellRendererText" id="renderer_otherupdates"/>
+                                  <object class="GtkCellRendererText"/>
                                   <attributes>
                                     <attribute name="text">0</attribute>
                                   </attributes>
@@ -690,7 +707,7 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
-                            <property name="position">2</property>
+                            <property name="position">3</property>
                           </packing>
                         </child>
                       </object>
@@ -713,7 +730,7 @@
                         <property name="can_focus">False</property>
                         <property name="spacing">6</property>
                         <child>
-                          <object class="GtkLabel" id="label29">
+                          <object class="GtkLabel" id="label_updates_5">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="label" translatable="yes">Notify me of a new Ubuntu version:</property>
@@ -1406,10 +1423,11 @@
   </object>
   <object class="GtkSizeGroup" id="sizegroup1">
     <widgets>
-      <widget name="label3"/>
-      <widget name="label4"/>
-      <widget name="label5"/>
-      <widget name="label29"/>
+      <widget name="label_updates_1"/>
+      <widget name="label_updates_2"/>
+      <widget name="label_updates_3"/>
+      <widget name="label_updates_4"/>
+      <widget name="label_updates_5"/>
     </widgets>
   </object>
 </interface>
diff --git a/po/software-properties.pot b/po/software-properties.pot
index 06e1e31..6d5c53a 100644
--- a/po/software-properties.pot
+++ b/po/software-properties.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-02-17 17:37+0100\n"
+"POT-Creation-Date: 2020-02-26 19:01+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -27,7 +27,7 @@ msgid "To change software repository settings, you need to authenticate."
 msgstr ""
 
 #: ../data/software-properties-gtk.desktop.in.h:1
-#: ../data/gtkbuilder/main.ui.h:14
+#: ../data/gtkbuilder/main.ui.h:17
 msgid "Software & Updates"
 msgstr ""
 
@@ -59,8 +59,8 @@ msgid ""
 msgstr ""
 
 #: ../data/software-properties-qt.desktop.in.h:1
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:693
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:712
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:796
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:815
 msgid "Software Sources"
 msgstr ""
 
@@ -254,27 +254,27 @@ msgid "Canceling..."
 msgstr ""
 
 #: ../softwareproperties/qt/SoftwarePropertiesQt.py:211
-#: ../data/gtkbuilder/main.ui.h:9
+#: ../data/gtkbuilder/main.ui.h:12
 msgid "Daily"
 msgstr ""
 
 #: ../softwareproperties/qt/SoftwarePropertiesQt.py:212
-#: ../data/gtkbuilder/main.ui.h:10
+#: ../data/gtkbuilder/main.ui.h:13
 msgid "Every two days"
 msgstr ""
 
 #: ../softwareproperties/qt/SoftwarePropertiesQt.py:213
-#: ../data/gtkbuilder/main.ui.h:11
+#: ../data/gtkbuilder/main.ui.h:14
 msgid "Weekly"
 msgstr ""
 
 #: ../softwareproperties/qt/SoftwarePropertiesQt.py:214
-#: ../data/gtkbuilder/main.ui.h:12
+#: ../data/gtkbuilder/main.ui.h:15
 msgid "Every two weeks"
 msgstr ""
 
 #: ../softwareproperties/qt/SoftwarePropertiesQt.py:221
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:266
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:313
 #, python-format
 msgid "Every %s days"
 msgstr ""
@@ -291,7 +291,7 @@ msgstr ""
 #. first %s is the description of the component
 #. second %s is the code name of the comp, eg main, universe
 #: ../softwareproperties/qt/SoftwarePropertiesQt.py:282
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:339
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:386
 #, python-format
 msgid "%s (%s)"
 msgstr ""
@@ -299,33 +299,33 @@ msgstr ""
 #. add a separator and the option to choose another mirror from the list
 #. #FIXME server_store.append(["sep", None, True])
 #: ../softwareproperties/qt/SoftwarePropertiesQt.py:345
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:469
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:562
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:543
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:671
 msgid "Other..."
 msgstr ""
 
 #: ../softwareproperties/qt/SoftwarePropertiesQt.py:713
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:985
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1081
 msgid "Import key"
 msgstr ""
 
 #: ../softwareproperties/qt/SoftwarePropertiesQt.py:716
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:999
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1095
 msgid "Error importing selected file"
 msgstr ""
 
 #: ../softwareproperties/qt/SoftwarePropertiesQt.py:717
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1000
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1096
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 
 #: ../softwareproperties/qt/SoftwarePropertiesQt.py:730
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1016
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1111
 msgid "Error removing the key"
 msgstr ""
 
 #: ../softwareproperties/qt/SoftwarePropertiesQt.py:731
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1017
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1112
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 
@@ -360,86 +360,86 @@ msgid "CD Error"
 msgstr ""
 
 #: ../softwareproperties/qt/SoftwarePropertiesQt.py:815
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:851
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:952
 msgid "Error scanning the CD"
 msgstr ""
 
 #: ../softwareproperties/qt/SoftwarePropertiesQt.py:857
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1080
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1172
 msgid "Error while applying changes"
 msgstr ""
 
 #: ../softwareproperties/qt/SoftwarePropertiesQt.py:1101
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1313
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1405
 msgid "This device is using the recommended driver."
 msgstr ""
 
 #: ../softwareproperties/qt/SoftwarePropertiesQt.py:1103
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1314
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1406
 msgid "This device is using an alternative driver."
 msgstr ""
 
 #: ../softwareproperties/qt/SoftwarePropertiesQt.py:1105
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1315
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1407
 msgid "This device is using a manually-installed driver."
 msgstr ""
 
 #: ../softwareproperties/qt/SoftwarePropertiesQt.py:1106
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1316
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1408
 msgid "This device is not working."
 msgstr ""
 
 #: ../softwareproperties/qt/SoftwarePropertiesQt.py:1115
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1325
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1417
 msgid "Continue using a manually installed driver"
 msgstr ""
 
 #: ../softwareproperties/qt/SoftwarePropertiesQt.py:1142
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1352
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1444
 msgid "Using {} from {}"
 msgstr ""
 
 #: ../softwareproperties/qt/SoftwarePropertiesQt.py:1144
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1354
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1446
 msgid "Using {}"
 msgstr ""
 
 #: ../softwareproperties/qt/SoftwarePropertiesQt.py:1151
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1361
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1453
 msgid "open source"
 msgstr ""
 
 #: ../softwareproperties/qt/SoftwarePropertiesQt.py:1153
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1363
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1455
 msgid "proprietary"
 msgstr ""
 
 #: ../softwareproperties/qt/SoftwarePropertiesQt.py:1156
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1366
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1458
 #, python-brace-format
 msgid "{base_description} ({licence}, tested)"
 msgstr ""
 
 #: ../softwareproperties/qt/SoftwarePropertiesQt.py:1158
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1368
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1460
 #, python-brace-format
 msgid "{base_description} ({licence})"
 msgstr ""
 
 #: ../softwareproperties/qt/SoftwarePropertiesQt.py:1176
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1388
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1480
 msgid "Do not use the device"
 msgstr ""
 
 #. 1 for priority over the icon to stretch
 #: ../softwareproperties/qt/SoftwarePropertiesQt.py:1219
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1426
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1518
 msgid "Unknown"
 msgstr ""
 
 #: ../softwareproperties/qt/SoftwarePropertiesQt.py:1287
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1494
-#: ../data/gtkbuilder/main.ui.h:37
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1586
+#: ../data/gtkbuilder/main.ui.h:40
 msgid "No proprietary drivers are in use."
 msgstr ""
 
@@ -477,7 +477,7 @@ msgstr ""
 msgid "Binary"
 msgstr ""
 
-#: ../softwareproperties/qt/DialogEdit.py:44 ../data/gtkbuilder/main.ui.h:15
+#: ../softwareproperties/qt/DialogEdit.py:44 ../data/gtkbuilder/main.ui.h:18
 msgid "Source code"
 msgstr ""
 
@@ -521,77 +521,81 @@ msgid "Completed %s of %s tests"
 msgstr ""
 
 #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:326
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:373
 #, python-format
 msgid "%s Software"
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:703
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:722
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:485
+msgid "Custom"
+msgstr ""
+
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:806
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:825
 msgid "Active"
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:761
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:863
 msgid "Key"
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:778
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:880
 msgid "_Add key from paste data"
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:791
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:802
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:893
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:904
 msgid "Error importing key"
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:792
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:803
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:894
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:905
 msgid "The selected data may not be a GPG key file or it might be corrupt."
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:852
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:953
 msgid "Could not find a suitable CD."
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1069
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1161
 msgid "Applying changes..."
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1188
-#: ../data/gtkbuilder/main.ui.h:45
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1280
+#: ../data/gtkbuilder/main.ui.h:48
 msgid "Re_vert"
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1190
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1282
 msgid "_Apply Changes"
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1192
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1284
 msgid "_Cancel"
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1194
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1286
 msgid "_Restart..."
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1209
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1301
 msgid "Searching for available drivers..."
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1239
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1331
 msgid "An error occurred while searching for drivers."
 msgstr ""
 
 #. No drivers found.
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1408
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1500
 msgid "No additional drivers available."
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1475
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1567
 msgid "You need to restart the computer to complete the driver changes."
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1489
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1581
 #, python-format
 msgid "%(count)d proprietary driver in use."
 msgid_plural "%(count)d proprietary drivers in use."
@@ -809,160 +813,172 @@ msgid "Scanning CD-ROM"
 msgstr ""
 
 #: ../data/gtkbuilder/main.ui.h:1
-msgid "Display immediately"
+msgid "All updates"
 msgstr ""
 
 #: ../data/gtkbuilder/main.ui.h:2
-msgid "Display weekly"
+msgid "Security and recommended updates"
 msgstr ""
 
 #: ../data/gtkbuilder/main.ui.h:3
-msgid "Display every two weeks"
+msgid "Security updates only"
 msgstr ""
 
 #: ../data/gtkbuilder/main.ui.h:4
-msgid "For any new version"
+msgid "Display immediately"
 msgstr ""
 
 #: ../data/gtkbuilder/main.ui.h:5
-msgid "For long-term support versions"
+msgid "Display weekly"
 msgstr ""
 
 #: ../data/gtkbuilder/main.ui.h:6
-msgid "Never"
+msgid "Display every two weeks"
 msgstr ""
 
 #: ../data/gtkbuilder/main.ui.h:7
-msgid "Download automatically"
+msgid "For any new version"
 msgstr ""
 
 #: ../data/gtkbuilder/main.ui.h:8
+msgid "For long-term support versions"
+msgstr ""
+
+#: ../data/gtkbuilder/main.ui.h:9
+msgid "Never"
+msgstr ""
+
+#: ../data/gtkbuilder/main.ui.h:10
+msgid "Download automatically"
+msgstr ""
+
+#: ../data/gtkbuilder/main.ui.h:11
 msgid "Download and install automatically"
 msgstr ""
 
-#: ../data/gtkbuilder/main.ui.h:13
+#: ../data/gtkbuilder/main.ui.h:16
 msgid "To install from a CD-ROM or DVD, insert the medium into the drive."
 msgstr ""
 
-#: ../data/gtkbuilder/main.ui.h:16
+#: ../data/gtkbuilder/main.ui.h:19
 msgid "Download from:"
 msgstr ""
 
-#: ../data/gtkbuilder/main.ui.h:17
+#: ../data/gtkbuilder/main.ui.h:20
 msgid "<b>Downloadable from the Internet</b>"
 msgstr ""
 
-#: ../data/gtkbuilder/main.ui.h:18
+#: ../data/gtkbuilder/main.ui.h:21
 msgid "<b>Installable from CD-ROM/DVD</b>"
 msgstr ""
 
-#: ../data/gtkbuilder/main.ui.h:19
+#: ../data/gtkbuilder/main.ui.h:22
 msgid "Add..."
 msgstr ""
 
-#: ../data/gtkbuilder/main.ui.h:20
+#: ../data/gtkbuilder/main.ui.h:23
 msgid "Edit..."
 msgstr ""
 
-#: ../data/gtkbuilder/main.ui.h:21
+#: ../data/gtkbuilder/main.ui.h:24
 msgid "Add Volume..."
 msgstr ""
 
-#: ../data/gtkbuilder/main.ui.h:22
+#: ../data/gtkbuilder/main.ui.h:25
 msgid "Other Software"
 msgstr ""
 
-#: ../data/gtkbuilder/main.ui.h:23
-msgid "Install updates from:"
+#: ../data/gtkbuilder/main.ui.h:26
+msgid "Subscribed to:"
 msgstr ""
 
-#: ../data/gtkbuilder/main.ui.h:24
+#: ../data/gtkbuilder/main.ui.h:27
 msgid "Automatically check for updates:"
 msgstr ""
 
-#: ../data/gtkbuilder/main.ui.h:25
+#: ../data/gtkbuilder/main.ui.h:28
 msgid "When there are security updates:"
 msgstr ""
 
-#: ../data/gtkbuilder/main.ui.h:26
+#: ../data/gtkbuilder/main.ui.h:29
 msgid "When there are other updates:"
 msgstr ""
 
-#: ../data/gtkbuilder/main.ui.h:27
+#: ../data/gtkbuilder/main.ui.h:30
 msgid "Notify me of a new Ubuntu version:"
 msgstr ""
 
-#: ../data/gtkbuilder/main.ui.h:28
+#: ../data/gtkbuilder/main.ui.h:31
 msgid "Updates"
 msgstr ""
 
-#: ../data/gtkbuilder/main.ui.h:29
+#: ../data/gtkbuilder/main.ui.h:32
 msgid "<b>Trusted software providers</b>"
 msgstr ""
 
-#: ../data/gtkbuilder/main.ui.h:30
+#: ../data/gtkbuilder/main.ui.h:33
 msgid "    "
 msgstr ""
 
-#: ../data/gtkbuilder/main.ui.h:31
+#: ../data/gtkbuilder/main.ui.h:34
 msgid ""
 "Keys are used to authenticate the correct source of software and so protect "
 "your computer from malicious software"
 msgstr ""
 
-#: ../data/gtkbuilder/main.ui.h:32
+#: ../data/gtkbuilder/main.ui.h:35
 msgid "_Import Key File..."
 msgstr ""
 
-#: ../data/gtkbuilder/main.ui.h:33
+#: ../data/gtkbuilder/main.ui.h:36
 msgid "Import the public key from a trusted software provider"
 msgstr ""
 
-#: ../data/gtkbuilder/main.ui.h:34
+#: ../data/gtkbuilder/main.ui.h:37
 msgid "Restore _Defaults"
 msgstr ""
 
-#: ../data/gtkbuilder/main.ui.h:35
+#: ../data/gtkbuilder/main.ui.h:38
 msgid "Restore the default keys of your distribution"
 msgstr ""
 
-#: ../data/gtkbuilder/main.ui.h:36
+#: ../data/gtkbuilder/main.ui.h:39
 msgid "Authentication"
 msgstr ""
 
-#: ../data/gtkbuilder/main.ui.h:38
+#: ../data/gtkbuilder/main.ui.h:41
 msgid ""
 "<small>A proprietary driver has private code that Ubuntu developers can't "
 "review or improve. Security and other updates are dependent on the driver "
 "vendor.</small>"
 msgstr ""
 
-#: ../data/gtkbuilder/main.ui.h:39
+#: ../data/gtkbuilder/main.ui.h:42
 msgid "Additional Drivers"
 msgstr ""
 
-#: ../data/gtkbuilder/main.ui.h:40
+#: ../data/gtkbuilder/main.ui.h:43
 msgid ""
 "Use proposed updates if you’re willing to report bugs on any problems that "
 "occur."
 msgstr ""
 
-#: ../data/gtkbuilder/main.ui.h:41
+#: ../data/gtkbuilder/main.ui.h:44
 msgid "Developer Options"
 msgstr ""
 
-#: ../data/gtkbuilder/main.ui.h:42
+#: ../data/gtkbuilder/main.ui.h:45
 msgid ""
 "Canonical Livepatch helps keep your system secure by applying security "
 "updates that don't require a restart. <a href=\"https://www.ubuntu.com/"
 "livepatch\">Learn More</a>"
 msgstr ""
 
-#: ../data/gtkbuilder/main.ui.h:43
+#: ../data/gtkbuilder/main.ui.h:46
 msgid "column"
 msgstr ""
 
-#: ../data/gtkbuilder/main.ui.h:44
+#: ../data/gtkbuilder/main.ui.h:47
 msgid "Show Livepatch status in the top bar"
 msgstr ""
 
diff --git a/softwareproperties/gtk/SoftwarePropertiesGtk.py b/softwareproperties/gtk/SoftwarePropertiesGtk.py
index ae35ec0..c38d406 100644
--- a/softwareproperties/gtk/SoftwarePropertiesGtk.py
+++ b/softwareproperties/gtk/SoftwarePropertiesGtk.py
@@ -1,12 +1,13 @@
 #  GTK+ based frontend to software-properties
 #
-#  Copyright (c) 2004-2018 Canonical Ltd.
+#  Copyright (c) 2004-2020 Canonical Ltd.
 #                2004-2005 Michiel Sikkes
 #
 #  Author: Michiel Sikkes <[e-mail]>
 #          Michael Vogt <[e-mail]>
 #          Sebastian Heinlein <[e-mail]>
 #          Andrea Azzarone <[e-mail]>
+#          Olivier Tilloy <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU General Public License as
@@ -83,6 +84,52 @@ RESPONSE_ADD = 2
     STORE_VISIBLE
 ) = list(range(5))
 
+# rows for the updates subscription combobox
+(
+    UPDATES_ALL,
+    UPDATES_RECOMMENDED,
+    UPDATES_SECURITY,
+    UPDATES_CUSTOM,
+) = range(4)
+
+# names of the pockets
+POCKET_SECURITY = "security"
+POCKET_UPDATES = "updates"
+POCKET_BACKPORTS = "backports"
+
+
+class UpdateSubscriptions(object):
+    security = False
+    updates = False
+    backports = False
+    other = False
+    inconsistent = False
+
+    def get_status(self):
+        if self.other:
+            return UPDATES_CUSTOM
+        if self.security and self.updates and self.backports:
+            return UPDATES_ALL
+        elif self.security and self.updates and not self.backports:
+            return UPDATES_RECOMMENDED
+        elif self.security and not self.updates and not self.backports:
+            return UPDATES_SECURITY
+        return UPDATES_CUSTOM
+
+
+def maybe_log_authentication_canceled_error(dbus_exception):
+    """Log an error if the DBus exception was raised because the user canceled
+    the authentication prompt shown when changing apt sources/configuration.
+
+    Return True if it is, so that calling code can do further processing,
+    False otherwise.
+    """
+    if dbus_exception._dbus_error_name == \
+      'com.ubuntu.SoftwareProperties.PermissionDeniedByPolicy':
+        logging.error("Authentication canceled, changes have not been saved")
+        return True
+    return False
+
 
 def error(parent_window, summary, msg):
     """ show a error dialog """
@@ -347,29 +394,28 @@ class SoftwarePropertiesGtk(SoftwareProperties, SimpleGtkbuilderApp):
             self.vbox_dist_comps.add(checkbox)
             checkbox.show()
 
-        # Setup the checkbuttons for the child repos / updates
-        for checkbutton in self.vbox_updates.get_children():
-            self.vbox_updates.remove(checkbutton)
+        # Setup the checkbuttons for the child repos
         for checkbutton in self.dev_box.get_children():
             self.dev_box.remove(checkbutton)
-        if len(self.distro.source_template.children) < 1:
-            self.frame_children.hide()
         for template in self.distro.source_template.children:
             # Do not show source entries in there
             if template.type == "deb-src":
                 continue
-
-            checkbox = Gtk.CheckButton(label="%s (%s)" % (template.description,
-                                                          template.name))
-            checkbox.template = template
-            self.handlers[checkbox] = checkbox.connect("toggled",
-                                                   self.on_checkbutton_child_toggled,
-                                                   template)
             if "proposed" in template.name:
+                checkbox = Gtk.CheckButton(label="%s (%s)" % (template.description,
+                                                              template.name))
+                checkbox.template = template
+                self.handlers[checkbox] = \
+                    checkbox.connect("toggled",
+                                     self.on_checkbutton_child_toggled,
+                                     template)
                 self.dev_box.add(checkbox)
-            else:
-                self.vbox_updates.add(checkbox)
-            checkbox.show()
+                checkbox.show()
+
+        # Setup the combo box for updates subscriptions
+        combobox = self.combobox_updates_subscription
+        self.handlers[combobox] = combobox.connect(
+            "changed", self.on_combobox_updates_subscription_changed)
 
         # setup the server chooser
         cell = Gtk.CellRendererText()
@@ -398,12 +444,6 @@ class SoftwarePropertiesGtk(SoftwareProperties, SimpleGtkbuilderApp):
         self.block_handlers()
 
         # Enable or disable the child source checkbuttons
-        for checkbox in self.vbox_updates.get_children():
-            (active, inconsistent) = self.get_comp_child_state(checkbox.template)
-            checkbox.set_active(active)
-            checkbox.set_inconsistent(inconsistent)
-
-        # Enable or disable the child source checkbuttons
         for checkbox in self.dev_box.get_children():
             (active, inconsistent) = self.get_comp_child_state(checkbox.template)
             checkbox.set_active(active)
@@ -416,14 +456,48 @@ class SoftwarePropertiesGtk(SoftwareProperties, SimpleGtkbuilderApp):
             checkbox.set_inconsistent(inconsistent)
             checkbox.set_active(active)
 
+        # Refresh the combo box for updates subscriptions
+        subscriptions = UpdateSubscriptions()
+        for template in self.distro.source_template.children:
+            # Do not show source entries in there
+            if template.type == "deb-src":
+                continue
+            pocket = template.name.split('-')[-1]
+            (active, inconsistent) = self.get_comp_child_state(template)
+            subscriptions.inconsistent |= inconsistent
+            if active:
+                if pocket == POCKET_SECURITY:
+                    subscriptions.security = True
+                elif pocket == POCKET_UPDATES:
+                    subscriptions.updates = True
+                elif pocket == POCKET_BACKPORTS:
+                    subscriptions.backports = True
+                else:
+                    subscriptions.other = True
+
+        status = subscriptions.get_status()
+        combobox = self.combobox_updates_subscription
+        model = combobox.get_model()
+        if status == UPDATES_CUSTOM:
+            try:
+                model.get_iter_from_string(str(UPDATES_CUSTOM))
+            except ValueError:
+                model.append([_("Custom")])
+        else:
+            try:
+                model.remove(model.get_iter_from_string(str(UPDATES_CUSTOM)))
+            except ValueError:
+                pass
+        combobox.set_active(status)
+        combobox.set_sensitive(not subscriptions.inconsistent)
+
         # If no components are enabled there will be no need for updates
         # and source code
         if len(self.distro.enabled_comps) < 1:
-            self.vbox_updates.set_sensitive(False)
+            self.combobox_updates_subscription.set_sensitive(False)
             self.dev_box.set_sensitive(False)
             self.checkbutton_source_code.set_sensitive(False)
         else:
-            self.vbox_updates.set_sensitive(True)
             self.dev_box.set_sensitive(True)
             self.checkbutton_source_code.set_sensitive(True)
 
@@ -510,9 +584,7 @@ class SoftwarePropertiesGtk(SoftwareProperties, SimpleGtkbuilderApp):
             if state != self.get_update_automation_level():
                 self.backend.SetUpdateAutomationLevel(state)
         except dbus.DBusException as e:
-            if e._dbus_error_name == 'com.ubuntu.SoftwareProperties.PermissionDeniedByPolicy':
-                logging.error("Authentication canceled, changes have not been saved")
-
+            if maybe_log_authentication_canceled_error(e):
                 combo_handler = self.handlers[self.combobox_security_updates]
                 self.combobox_security_updates.handler_block(combo_handler)
                 self.set_security_update_level()
@@ -537,15 +609,52 @@ class SoftwarePropertiesGtk(SoftwareProperties, SimpleGtkbuilderApp):
         try:
             self.backend.SetReleaseUpgradesPolicy(i)
         except dbus.DBusException as e:
-            if e._dbus_error_name == 'com.ubuntu.SoftwareProperties.PermissionDeniedByPolicy':
-                logging.error("Authentication canceled, changes have not been saved")
-
+            if maybe_log_authentication_canceled_error(e):
                 combo_handler = self.handlers[self.combobox_release_upgrades]
                 self.combobox_release_upgrades.handler_block(combo_handler)
                 i = self.get_release_upgrades_policy()
                 self.combobox_release_upgrades.set_active(i)
                 self.combobox_release_upgrades.handler_unblock(combo_handler)
 
+    def on_combobox_updates_subscription_changed(self, combobox):
+        index = combobox.get_active()
+        if index != UPDATES_CUSTOM:
+            model = combobox.get_model()
+            try:
+                model.remove(model.get_iter_from_string(str(UPDATES_CUSTOM)))
+            except ValueError:
+                pass
+
+        def _toggle_child_source(pocket, enabled):
+            source = "{}-{}".format(self.distro.codename, pocket)
+            if enabled:
+                logging.info("enabling {}".format(source))
+                self.backend.EnableChildSource(source)
+            else:
+                logging.info("disabling {}".format(source))
+                self.backend.DisableChildSource(source)
+
+        try:
+            if index == UPDATES_ALL:
+                _toggle_child_source(POCKET_SECURITY, True)
+                _toggle_child_source(POCKET_UPDATES, True)
+                _toggle_child_source(POCKET_BACKPORTS, True)
+            elif index == UPDATES_RECOMMENDED:
+                _toggle_child_source(POCKET_SECURITY, True)
+                _toggle_child_source(POCKET_UPDATES, True)
+                _toggle_child_source(POCKET_BACKPORTS, False)
+            elif index == UPDATES_SECURITY:
+                _toggle_child_source(POCKET_SECURITY, True)
+                _toggle_child_source(POCKET_UPDATES, False)
+                _toggle_child_source(POCKET_BACKPORTS, False)
+            for template in self.distro.source_template.children:
+                if template.type == "deb-src":
+                    continue
+                pocket = template.name.split('-')[-1]
+                if pocket not in (POCKET_SECURITY, POCKET_UPDATES, POCKET_BACKPORTS):
+                    _toggle_child_source(pocket, False)
+        except dbus.DBusException as e:
+            maybe_log_authentication_canceled_error(e)
 
     def on_combobox_server_changed(self, combobox):
         """
@@ -573,8 +682,7 @@ class SoftwarePropertiesGtk(SoftwareProperties, SimpleGtkbuilderApp):
                 self.active_server = combobox.get_active()
                 self.backend.ChangeMainDownloadServer(uri)
         except dbus.DBusException as e:
-            if e._dbus_error_name == 'com.ubuntu.SoftwareProperties.PermissionDeniedByPolicy':
-                logging.error("Authentication canceled, changes have not been saved")
+            maybe_log_authentication_canceled_error(e)
 
         # mvo: is this still needed?
         #else:
@@ -591,8 +699,7 @@ class SoftwarePropertiesGtk(SoftwareProperties, SimpleGtkbuilderApp):
             else:
                 self.backend.DisableComponent(comp)
         except dbus.DBusException as e:
-            if e._dbus_error_name == 'com.ubuntu.SoftwareProperties.PermissionDeniedByPolicy':
-                logging.error("Authentication canceled, changes have not been saved")
+            maybe_log_authentication_canceled_error(e)
 
     def on_checkbutton_child_toggled(self, checkbutton, template):
         """
@@ -604,8 +711,7 @@ class SoftwarePropertiesGtk(SoftwareProperties, SimpleGtkbuilderApp):
             else:
                 self.backend.EnableChildSource(template.name)
         except dbus.DBusException as e:
-            if e._dbus_error_name == 'com.ubuntu.SoftwareProperties.PermissionDeniedByPolicy':
-                logging.error("Authentication canceled, changes have not been saved")
+            maybe_log_authentication_canceled_error(e)
 
     def on_checkbutton_source_code_toggled(self, checkbutton):
         """ Disable or enable the source code for all sources """
@@ -615,8 +721,7 @@ class SoftwarePropertiesGtk(SoftwareProperties, SimpleGtkbuilderApp):
             else:
                 self.backend.DisableSourceCodeSources()
         except dbus.DBusException as e:
-            if e._dbus_error_name == 'com.ubuntu.SoftwareProperties.PermissionDeniedByPolicy':
-                logging.error("Authentication canceled, changes have not been saved")
+            maybe_log_authentication_canceled_error(e)
 
     def on_checkbutton_popcon_toggled(self, widget):
         """ The user clicked on the popcon paritipcation button """
@@ -626,8 +731,7 @@ class SoftwarePropertiesGtk(SoftwareProperties, SimpleGtkbuilderApp):
             try:
                 self.backend.SetPopconPariticipation(widget.get_active())
             except dbus.DBusException as e:
-                if e._dbus_error_name == 'com.ubuntu.SoftwareProperties.PermissionDeniedByPolicy':
-                    logging.error("Authentication canceled, changes have not been saved")
+                maybe_log_authentication_canceled_error(e)
 
     def open_file(self, file):
         """Show a confirmation for adding the channels of the specified file"""
@@ -645,8 +749,7 @@ class SoftwarePropertiesGtk(SoftwareProperties, SimpleGtkbuilderApp):
                     for source in new_sources:
                         self.backend.AddSourceFromLine(str(source))
         except dbus.DBusException as e:
-            if e._dbus_error_name == 'com.ubuntu.SoftwareProperties.PermissionDeniedByPolicy':
-                logging.error("Authentication canceled, changes have not been saved")
+            maybe_log_authentication_canceled_error(e)
 
     def on_sources_drag_data_received(self, widget, context, x, y,
                                       selection, target_type, timestamp):
@@ -750,8 +853,7 @@ class SoftwarePropertiesGtk(SoftwareProperties, SimpleGtkbuilderApp):
         try:
             self.backend.ToggleSourceUse(str(source_entry))
         except dbus.DBusException as e:
-            if e._dbus_error_name == 'com.ubuntu.SoftwareProperties.PermissionDeniedByPolicy':
-                logging.error("Authentication canceled, changes have not been saved")
+            maybe_log_authentication_canceled_error(e)
 
     def init_keys(self):
         """Setup the user interface parts needed for the key handling"""
@@ -812,8 +914,7 @@ class SoftwarePropertiesGtk(SoftwareProperties, SimpleGtkbuilderApp):
         try:
             self.backend.Revert()
         except dbus.DBusException as e:
-            if e._dbus_error_name == 'com.ubuntu.SoftwareProperties.PermissionDeniedByPolicy':
-                logging.error("Authentication canceled, changes have not been saved")
+            maybe_log_authentication_canceled_error(e)
         if self.settings:
             self.settings.set_int("regular-auto-launch-interval", self.initial_auto_launch)
         self.show_auto_update_level()
@@ -897,9 +998,7 @@ class SoftwarePropertiesGtk(SoftwareProperties, SimpleGtkbuilderApp):
             try:
                 self.backend.SetUpdateInterval(value)
             except dbus.DBusException as e:
-                if e._dbus_error_name == 'com.ubuntu.SoftwareProperties.PermissionDeniedByPolicy':
-                    logging.error("Authentication canceled, changes have not been saved")
-
+                if maybe_log_authentication_canceled_error(e):
                     update_days = self.get_update_interval()
                     combo_handler = self.handlers[self.combobox_update_interval]
                     for key in self.combobox_interval_mapping:
@@ -918,8 +1017,7 @@ class SoftwarePropertiesGtk(SoftwareProperties, SimpleGtkbuilderApp):
             try:
                 self.backend.AddSourceFromLine(line)
             except dbus.DBusException as e:
-                if e._dbus_error_name == 'com.ubuntu.SoftwareProperties.PermissionDeniedByPolicy':
-                    logging.error("Authentication canceled, changes have not been saved")
+                maybe_log_authentication_canceled_error(e)
 
     def on_edit_clicked(self, widget):
         """Show a dialog to edit an ISV source"""
@@ -935,8 +1033,7 @@ class SoftwarePropertiesGtk(SoftwareProperties, SimpleGtkbuilderApp):
                 self.backend.ReplaceSourceEntry(str(old_source_entry),
                                                 str(dialog.new_source_entry))
             except dbus.DBusException as e:
-                if e._dbus_error_name == 'com.ubuntu.SoftwareProperties.PermissionDeniedByPolicy':
-                    logging.error("Authentication canceled, changes have not been saved")
+                maybe_log_authentication_canceled_error(e)
 
     # FIXME:outstanding from merge
     def on_isv_source_activated(self, treeview, path, column):
@@ -976,8 +1073,7 @@ class SoftwarePropertiesGtk(SoftwareProperties, SimpleGtkbuilderApp):
             try:
                 self.backend.RemoveSource(str(source_entry))
             except dbus.DBusException as e:
-                if e._dbus_error_name == 'com.ubuntu.SoftwareProperties.PermissionDeniedByPolicy':
-                    logging.error("Authentication canceled, changes have not been saved")
+                maybe_log_authentication_canceled_error(e)
 
     def add_key_clicked(self, widget):
         """Provide a file chooser that allows to add the gnupg of a trusted
@@ -1000,8 +1096,7 @@ class SoftwarePropertiesGtk(SoftwareProperties, SimpleGtkbuilderApp):
                           _("The selected file may not be a GPG key file "
                             "or it might be corrupt."))
             except dbus.DBusException as e:
-                if e._dbus_error_name == 'com.ubuntu.SoftwareProperties.PermissionDeniedByPolicy':
-                    logging.error("Authentication canceled, changes have not been saved")
+                maybe_log_authentication_canceled_error(e)
 
     def remove_key_clicked(self, widget):
         """Remove a trusted software vendor key"""
@@ -1017,16 +1112,14 @@ class SoftwarePropertiesGtk(SoftwareProperties, SimpleGtkbuilderApp):
                       _("The key you selected could not be removed. "
                         "Please report this as a bug."))
         except dbus.DBusException as e:
-            if e._dbus_error_name == 'com.ubuntu.SoftwareProperties.PermissionDeniedByPolicy':
-                logging.error("Authentication canceled, changes have not been saved")
+            maybe_log_authentication_canceled_error(e)
 
     def on_restore_clicked(self, widget):
         """Restore the original keys"""
         try:
             self.backend.UpdateKeys()
         except dbus.DBusException as e:
-            if e._dbus_error_name == 'com.ubuntu.SoftwareProperties.PermissionDeniedByPolicy':
-                logging.error("Authentication canceled, changes have not been saved")
+            maybe_log_authentication_canceled_error(e)
 
     def on_delete_event(self, widget, args):
         """Close the window if requested"""
@@ -1054,8 +1147,7 @@ class SoftwarePropertiesGtk(SoftwareProperties, SimpleGtkbuilderApp):
         try:
             self.backend.AddCdromSource()
         except dbus.DBusException as e:
-            if e._dbus_error_name == 'com.ubuntu.SoftwareProperties.PermissionDeniedByPolicy':
-                logging.error("Authentication canceled, changes have not been saved")
+            maybe_log_authentication_canceled_error(e)
 
     def on_driver_changes_progress(self, progress, ptype, data=None):
         #print(progress)