|
 |
ff287f |
diff --git a/dnf-plugin-spacewalk.spec b/dnf-plugin-spacewalk.spec
|
|
|
ff287f |
index fd42348..d2c31fa 100644
|
|
|
ff287f |
--- a/dnf-plugin-spacewalk.spec
|
|
|
ff287f |
+++ b/dnf-plugin-spacewalk.spec
|
|
|
ff287f |
@@ -12,7 +12,7 @@
|
|
|
ff287f |
Summary: DNF plugin for Spacewalk
|
|
|
ff287f |
Name: dnf-plugin-spacewalk
|
|
|
ff287f |
Version: 2.8.5
|
|
|
ff287f |
-Release: 9%{?dist}
|
|
|
ff287f |
+Release: 10%{?dist}
|
|
|
ff287f |
License: GPLv2
|
|
|
ff287f |
Source0: https://github.com/spacewalkproject/spacewalk/archive/%{name}-%{version}.tar.gz
|
|
|
ff287f |
URL: https://github.com/spacewalkproject/spacewalk
|
|
|
ff287f |
@@ -113,6 +113,9 @@ install -m 644 actions/errata.py %{buildroot}%{python3_sitelib}/rhn/actions/
|
|
|
ff287f |
%endif
|
|
|
ff287f |
|
|
|
ff287f |
%changelog
|
|
|
ff287f |
+* Wed Apr 03 2019 Michael Mraka <michael.mraka@redhat.com> 2.8.5-10
|
|
|
ff287f |
+- Resolves: #1673445 - changed wording to refer to Red Hat Satellite
|
|
|
ff287f |
+
|
|
|
ff287f |
* Wed Dec 19 2018 Michael Mraka <michael.mraka@redhat.com> 2.8.5-9
|
|
|
ff287f |
- Resolves: #1660552 - report and fail gracefully if not root
|
|
|
ff287f |
- logger.warn() has been obsoleted
|
|
|
ff287f |
diff --git a/spacewalk.py b/spacewalk.py
|
|
|
ff287f |
index 1e60eef..89e7822 100644
|
|
|
ff287f |
--- a/spacewalk.py
|
|
|
ff287f |
+++ b/spacewalk.py
|
|
|
ff287f |
@@ -38,17 +38,17 @@ from up2date_client import up2dateErrors
|
|
|
ff287f |
|
|
|
ff287f |
STORED_CHANNELS_NAME = '_spacewalk.json'
|
|
|
ff287f |
|
|
|
ff287f |
-RHN_DISABLED = _("Spacewalk based repositories will be disabled.")
|
|
|
ff287f |
-CHANNELS_DISABLED = _("Spacewalk channel support will be disabled.")
|
|
|
ff287f |
-COMMUNICATION_ERROR = _("There was an error communicating with Spacewalk server.")
|
|
|
ff287f |
-NOT_REGISTERED_ERROR = _("This system is not registered with Spacewalk server.")
|
|
|
ff287f |
+RHN_DISABLED = _("Red Hat Satellite or Spacewalk based repositories will be disabled.")
|
|
|
ff287f |
+CHANNELS_DISABLED = _("Red Hat Satellite or Spacewalk channel support will be disabled.")
|
|
|
ff287f |
+COMMUNICATION_ERROR = _("There was an error communicating with Red Hat Satellite or Spacewalk server.")
|
|
|
ff287f |
+NOT_REGISTERED_ERROR = _("This system is not registered with Red Hat Satellite or Spacewalk server.")
|
|
|
ff287f |
NOT_SUBSCRIBED_ERROR = _("This system is not subscribed to any channels.")
|
|
|
ff287f |
NO_SYSTEM_ID_ERROR = _("SystemId could not be acquired.")
|
|
|
ff287f |
USE_RHNREGISTER = _("You can use rhn_register to register.")
|
|
|
ff287f |
-UPDATES_FROM_SPACEWALK = _("This system is receiving updates from Spacewalk server.")
|
|
|
ff287f |
-GPG_KEY_REJECTED = _("For security reasons packages from Spacewalk based repositories can be verified only with locally installed gpg keys. GPG key '%s' has been rejected.")
|
|
|
ff287f |
+UPDATES_FROM_SPACEWALK = _("This system is receiving updates from Red Hat Satellite or Spacewalk server.")
|
|
|
ff287f |
+GPG_KEY_REJECTED = _("For security reasons packages from Red Hat Satellite or Spacewalk based repositories can be verified only with locally installed gpg keys. GPG key '%s' has been rejected.")
|
|
|
ff287f |
PROFILE_NOT_SENT = _("Package profile information could not be sent.")
|
|
|
ff287f |
-MISSING_HEADER = _("Missing required login information for Spacewalk: %s")
|
|
|
ff287f |
+MISSING_HEADER = _("Missing required login information for Red Hat Satellite or Spacewalk: %s")
|
|
|
ff287f |
MUST_BE_ROOT = _('Spacewalk plugin has to be run under with the root privileges.')
|
|
|
ff287f |
|
|
|
ff287f |
class Spacewalk(dnf.Plugin):
|