From 2128e47cb7ffc66452b7716a38ffbbd9e5ecc258 Mon Sep 17 00:00:00 2001 From: Dheyay Date: Wed, 31 Jan 2024 11:52:29 -0800 Subject: [PATCH] Updating messages that suggest running pro to include sudo. Fixes: #2598 --- debian/po/pt_BR.po | 10 +++++----- debian/po/ubuntu-pro.pot | 10 +++++----- debian/ubuntu-advantage-tools.postinst | 2 +- features/livepatch.feature | 4 ++-- uaclient/config.py | 2 +- uaclient/messages/__init__.py | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po index bfa2986f8c..003081bf39 100644 --- a/debian/po/pt_BR.po +++ b/debian/po/pt_BR.po @@ -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 \n" "Language-Team: Brazilian Portuguese \n" "Language-Team: LANGUAGE \n" @@ -2506,8 +2506,8 @@ 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 @@ -2515,8 +2515,8 @@ msgstr "" 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 diff --git a/debian/ubuntu-advantage-tools.postinst b/debian/ubuntu-advantage-tools.postinst index b11748fee8..c8c6898f17 100644 --- a/debian/ubuntu-advantage-tools.postinst +++ b/debian/ubuntu-advantage-tools.postinst @@ -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 diff --git a/features/livepatch.feature b/features/livepatch.feature index 2b7e5c4315..31c965da59 100644 --- a/features/livepatch.feature +++ b/features/livepatch.feature @@ -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. """ When I run `pro disable livepatch` with sudo @@ -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` diff --git a/uaclient/config.py b/uaclient/config.py index b9b583add8..bf62288254 100644 --- a/uaclient/config.py +++ b/uaclient/config.py @@ -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" ' field/value pair present under "ua_config" in' " /etc/ubuntu-advantage/uaclient.conf" ) diff --git a/uaclient/messages/__init__.py b/uaclient/messages/__init__.py index 1f1f6983f8..5a996eb4a6 100644 --- a/uaclient/messages/__init__.py +++ b/uaclient/messages/__init__.py @@ -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( @@ -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