unexpected error message is now formatted and takes in an error message

canonical · Nov 27, 2023 · 64a822f · 64a822f
1 parent 17aa472
commit 64a822f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/uaclient/cli/__init__.py b/uaclient/cli/__init__.py
@@ -1764,7 +1764,7 @@ def wrapper(*args, **kwargs):
             LOG.exception("Unhandled exception, please file a bug")
             lock.clear_lock_file_if_present()
             event.info(
-                info_msg=messages.UNEXPECTED_ERROR.msg, file_type=sys.stderr
+                info_msg=messages.UNEXPECTED_ERROR.format(error_msg=str(e)), file_type=sys.stderr
             )
             event.error(
                 error_msg=getattr(e, "msg", str(e)), error_type="exception"

diff --git a/uaclient/cli/tests/test_cli.py b/uaclient/cli/tests/test_cli.py
@@ -491,7 +491,7 @@ class TestMain:
         (
             (
                 TypeError("'NoneType' object is not subscriptable"),
-                messages.UNEXPECTED_ERROR.msg,
+                messages.UNEXPECTED_ERROR.format(error_msg="'NoneType' object is not subscriptable").msg,
                 "Unhandled exception, please file a bug",
             ),
         ),

diff --git a/uaclient/contract.py b/uaclient/contract.py
@@ -551,7 +551,7 @@ def process_entitlements_delta(
     if unexpected_error:
         raise exceptions.AttachFailureUnknownError(
             failed_services=[
-                (name, messages.UNEXPECTED_ERROR) for name in failed_services
+                (name, messages.UNEXPECTED_ERROR.format(error_msg=str(e))) for name in failed_services
             ]
         )
     elif delta_error:

diff --git a/uaclient/messages/__init__.py b/uaclient/messages/__init__.py
@@ -1531,13 +1531,14 @@ def __repr__(self):
 the --access-only flag.""",
 )
 
-UNEXPECTED_ERROR = NamedMessage(
+UNEXPECTED_ERROR = FormattedNamedMessage(
     "unexpected-error",
     t.gettext(
         """\
-Unexpected error(s) occurred.
-For more details, see the log: /var/log/ubuntu-advantage.log
-To file a bug run: ubuntu-bug ubuntu-advantage-tools"""
+Unexpected error(s) occurred: {error_msg}
+For more details, see the log: ~/.cache/ubuntu-pro/ubuntu-pro.log
+First, try searching online for solutions to this error.
+Otherwise, file a bug using the command: ubuntu-bug ubuntu-advantage-tools"""
     ),
 )