Merge ~nteodosio/software-properties:catch-exception into software-properties:ubuntu/master

[Nathan Teodosio]

    Polling: Catch any exception to wait()

    Uncaught exceptions to wait will trigger error reports even though
    it's only the polling thread that dies:
    https://launchpad.net/bugs/2003996

    They are caused by connectivity issues.

    This is temporary until a UX plan has been devised to warn the user
    about the connectivity issue.

[Sebastien Bacher (seb128)]

Thanks. Should we be more specific about the exception we catch there and maybe display a string indicating the context in addition of the exception?

Like catch TimeoutError print("Error getting the ubuntu pro token")

review: Needs Information

[Nathan Teodosio (nteodosio)]

I think printing the context is indeed a good idea, but unsure about
catching specific exceptions.

The UA API[1] does not even list TimeoutError, it is raised by SSL, so
maybe by trying to be more specific we might not exhaust the list of
possibilities?

[1]:
https://github.com/canonical/ubuntu-advantage-client/blob/main/docs/references/api.md#raised-exceptions-2

[Sebastien Bacher (seb128)]

right, let's try to not be over specific and don't limit to TimeoutError

[Nathan Teodosio (nteodosio)]

Thanks for the suggestion, force pushed.

[Sebastien Bacher (seb128)]

Thanks

review: Approve

diff --git a/softwareproperties/gtk/DialogUaAttach.py b/softwareproperties/gtk/DialogUaAttach.py
index 4959b14..7c7f89d 100644
--- a/softwareproperties/gtk/DialogUaAttach.py
+++ b/softwareproperties/gtk/DialogUaAttach.py
@@ -147,6 +147,8 @@ class DialogUaAttach:
             GLib.idle_add(self.update_state, 'pin_validated')
         except MagicAttachTokenError:
             GLib.idle_add(self.update_state, 'expired')
+        except Exception as e:
+            print("Error getting the Ubuntu Pro token: ", e)
         finally:
             self.poll = None