Merge ~nteodosio/software-properties:warning into software-properties:ubuntu/master

[Nathan Teodosio]

If present, display service warning.

Unmerged commits

3401f58... by Nathan Teodosio on 2023-03-10

Retrieve and print warning if service has one.

diff --git a/softwareproperties/gtk/UbuntuProPage.py b/softwareproperties/gtk/UbuntuProPage.py
index 113fed0..02b5230 100644
--- a/softwareproperties/gtk/UbuntuProPage.py
+++ b/softwareproperties/gtk/UbuntuProPage.py
@@ -29,11 +29,12 @@ from .DialogUaDetach import DialogUaDetach
 from .DialogUaFipsEnable import DialogUaFipsEnable
 
 class UaService:
-    def __init__(self, bus_object, name, entitled, status):
+    def __init__(self, bus_object, name, entitled, status, warning):
         self.bus_object = bus_object
         self.name = name
         self.entitled = entitled
         self.status = status
+        self.warning = warning
         self.request_in_progress = False
 
 class UbuntuProPage(object):
@@ -131,7 +132,7 @@ class UbuntuProPage(object):
             elif path.startswith('/com/canonical/UbuntuAdvantage/Services/'):
                 properties = interfaces_and_properties.get('com.canonical.UbuntuAdvantage.Service')
                 bus_object = bus.get_object('com.canonical.UbuntuAdvantage', path)
-                self.services[path] = UaService(bus_object, properties['Name'], properties['Entitled'], properties['Status'])
+                self.services[path] = UaService(bus_object, properties['Name'], properties['Entitled'], properties['Status'], properties.get('Warning'))
             self.update_status()
         def on_interfaces_removed(path, interfaces):
             if 'com.canonical.UbuntuAdvantage.Service' in interfaces:
@@ -149,6 +150,7 @@ class UbuntuProPage(object):
                 service = self.services[path]
                 service.entitled = get_property(changed_properties, 'Entitled', service.entitled)
                 service.status = get_property(changed_properties, 'Status', service.status)
+                service.warning = get_property(changed_properties, 'Warning', service.warning)
             self.update_status()
         object_manager_object = bus.get_object('com.canonical.UbuntuAdvantage', '/')
         object_manager_object.connect_to_signal('InterfacesAdded', on_interfaces_added, dbus_interface='org.freedesktop.DBus.ObjectManager')
@@ -176,6 +178,8 @@ class UbuntuProPage(object):
             return service is not None and service.request_in_progress
         def service_is_enabled(service):
             return service is not None and service.status == 'enabled'
+        def service_has_warning(service):
+            return service is not None and service.warning is not None
 
         def update_switch(switch, service, handler):
             if service is not None and service.request_in_progress:
@@ -199,6 +203,8 @@ class UbuntuProPage(object):
             widget.set_sensitive(entitled_to_service(livepatch_service) and not service_request_in_progress(livepatch_service))
         update_switch(self.switch_ua_livepatch, livepatch_service, self.on_ua_livepatch_changed_handler)
         self.checkbutton_livepatch_topbar.set_sensitive(self.update_notifier_settings is not None and self.switch_ua_livepatch.get_active())
+        if service_has_warning(livepatch_service):
+            print(service.warning[Message])
 
         fips_service = self.get_service('fips')
         fips_updates_service = self.get_service('fips-updates')