Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to message recommendations asking to run pro #2936

Merged
merged 1 commit into from
Feb 12, 2024
Merged

Update to message recommendations asking to run pro #2936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions debian/po/pt_BR.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-01-18 10:50-0500\n"
"POT-Creation-Date: 2024-02-05 11:04-0800\n"
"PO-Revision-Date: 2023-09-25 12:29-0400\n"
"Last-Translator: Lucas Moura <[email protected]>\n"
"Language-Team: Brazilian Portuguese <[email protected]."
Expand Down Expand Up @@ -2842,17 +2842,17 @@ msgid ""
"The current kernel ({{version}}, {{arch}}) has reached the end of its "
"livepatch support.\n"
"Supported kernels are listed here: {url}\n"
"Either switch to a supported kernel or `pro disable livepatch` to dismiss "
"this warning."
"Either switch to a supported kernel or `sudo pro disable livepatch` to "
"dismiss this warning."
msgstr ""

#: ../../uaclient/messages/__init__.py:1835
#, python-brace-format
msgid ""
"The current kernel ({{version}}, {{arch}}) is not supported by livepatch.\n"
"Supported kernels are listed here: {url}\n"
"Either switch to a supported kernel or `pro disable livepatch` to dismiss "
"this warning."
"Either switch to a supported kernel or `sudo pro disable livepatch` to "
"dismiss this warning."
msgstr ""

#: ../../uaclient/messages/__init__.py:1845
Expand Down
10 changes: 5 additions & 5 deletions debian/po/ubuntu-pro.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-01-18 10:50-0500\n"
"POT-Creation-Date: 2024-02-05 11:04-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -2506,17 +2506,17 @@ msgid ""
"The current kernel ({{version}}, {{arch}}) has reached the end of its "
"livepatch support.\n"
"Supported kernels are listed here: {url}\n"
"Either switch to a supported kernel or `pro disable livepatch` to dismiss "
"this warning."
"Either switch to a supported kernel or `sudo pro disable livepatch` to "
"dismiss this warning."
msgstr ""

#: ../../uaclient/messages/__init__.py:1835
#, python-brace-format
msgid ""
"The current kernel ({{version}}, {{arch}}) is not supported by livepatch.\n"
"Supported kernels are listed here: {url}\n"
"Either switch to a supported kernel or `pro disable livepatch` to dismiss "
"this warning."
"Either switch to a supported kernel or `sudo pro disable livepatch` to "
"dismiss this warning."
msgstr ""

#: ../../uaclient/messages/__init__.py:1845
Expand Down
2 changes: 1 addition & 1 deletion debian/ubuntu-advantage-tools.postinst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ case "$1" in
if grep -q "^ua_config:" /etc/ubuntu-advantage/uaclient.conf; then
echo "Warning: uaclient.conf contains old ua_config field." >&2
echo " Please do the following:" >&2
echo " 1. Run 'pro config set field=value' for each field/value pair" >&2
echo " 1. Run 'sudo pro config set field=value' for each field/value pair" >&2
echo " present under ua_config in /etc/ubuntu-advantage/uaclient.conf" >&2
echo " 2. Delete ua_config and all sub-fields in" >&2
echo " /etc/ubuntu-advantage/uaclient.conf" >&2
Expand Down
4 changes: 2 additions & 2 deletions features/livepatch.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Feature: Livepatch
NOTICES
The current kernel \(5.4.0-(\d+)-kvm, x86_64\) is not supported by livepatch.
Supported kernels are listed here: https://ubuntu.com/security/livepatch/docs/kernels
Either switch to a supported kernel or `pro disable livepatch` to dismiss this warning.
Either switch to a supported kernel or `sudo pro disable livepatch` to dismiss this warning.
dheyay marked this conversation as resolved.
Show resolved Hide resolved

"""
When I run `pro disable livepatch` with sudo
Expand All @@ -65,7 +65,7 @@ Feature: Livepatch
NOTICES
The current kernel \(5.4.0-(\d+)-kvm, x86_64\) is not supported by livepatch.
Supported kernels are listed here: https://ubuntu.com/security/livepatch/docs/kernels
Either switch to a supported kernel or `pro disable livepatch` to dismiss this warning.
Either switch to a supported kernel or `sudo pro disable livepatch` to dismiss this warning.

"""
When I apt install `linux-generic`
Expand Down
2 changes: 1 addition & 1 deletion uaclient/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ def warn_about_invalid_keys(self):
LOG.warning('legacy "ua_config" found in uaclient.conf')
LOG.warning("Please do the following:")
LOG.warning(
" 1. run `pro config set field=value` for each"
" 1. run `sudo pro config set field=value` for each"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems we also have that same suggestion on postinst. I think we should update it there as well

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be good now @lucasmoura, thanks!

' field/value pair present under "ua_config" in'
" /etc/ubuntu-advantage/uaclient.conf"
)
Expand Down
4 changes: 2 additions & 2 deletions uaclient/messages/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1826,7 +1826,7 @@ def __repr__(self):
"""\
The current kernel ({{version}}, {{arch}}) has reached the end of its livepatch support.
Supported kernels are listed here: {url}
Either switch to a supported kernel or `pro disable livepatch` to dismiss this warning.""" # noqa: E501
Either switch to a supported kernel or `sudo pro disable livepatch` to dismiss this warning.""" # noqa: E501
).format(url=urls.LIVEPATCH_SUPPORTED_KERNELS),
)
LIVEPATCH_KERNEL_NOT_SUPPORTED = FormattedNamedMessage(
Expand All @@ -1835,7 +1835,7 @@ def __repr__(self):
"""\
The current kernel ({{version}}, {{arch}}) is not supported by livepatch.
Supported kernels are listed here: {url}
Either switch to a supported kernel or `pro disable livepatch` to dismiss this warning.""" # noqa: E501
Either switch to a supported kernel or `sudo pro disable livepatch` to dismiss this warning.""" # noqa: E501
).format(
url=urls.LIVEPATCH_SUPPORTED_KERNELS
), # noqa: E501
Expand Down
Loading