client/rhel/yum-rhn-plugin/rhnplugin.py | 13 +++++++++----
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 5 ++++-
rel-eng/packages/yum-rhn-plugin | 2 +-
3 files changed, 14 insertions(+), 6 deletions(-)
New commits:
commit cc0b6d184e86d3d4b3c9d63aefaa5b8a5fef8a5c
Author: Stephen Herr <sherr(a)redhat.com>
Date: Mon Jul 23 14:49:21 2012 -0400
Automatic commit of package [yum-rhn-plugin] release [1.8.4-1].
diff --git a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
index a75f12b..dfcad31 100644
--- a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
+++ b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
@@ -1,6 +1,6 @@
Summary: RHN support for yum
Name: yum-rhn-plugin
-Version: 1.8.3
+Version: 1.8.4
Release: 1%{?dist}
License: GPLv2
Group: System Environment/Base
@@ -70,6 +70,9 @@ fi
%doc LICENSE
%changelog
+* Mon Jul 23 2012 Stephen Herr <sherr(a)redhat.com> 1.8.4-1
+- 842396 - Updated yum info messages to play nice with Subscription Management
+
* Tue Jul 10 2012 Stephen Herr <sherr(a)redhat.com> 1.8.3-1
- 839052 - yum-rhn-plugin honors yum timeout value
diff --git a/rel-eng/packages/yum-rhn-plugin b/rel-eng/packages/yum-rhn-plugin
index 71b73f4..8b1bd3d 100644
--- a/rel-eng/packages/yum-rhn-plugin
+++ b/rel-eng/packages/yum-rhn-plugin
@@ -1 +1 @@
-1.8.3-1 client/rhel/yum-rhn-plugin/
+1.8.4-1 client/rhel/yum-rhn-plugin/
commit 9e5a8514c9262f004245b3b0a51cb8bae286c56b
Author: Stephen Herr <sherr(a)redhat.com>
Date: Mon Jul 23 14:48:17 2012 -0400
842396 - Updated yum info messages to play nice with Subscription Management
diff --git a/client/rhel/yum-rhn-plugin/rhnplugin.py
b/client/rhel/yum-rhn-plugin/rhnplugin.py
index fda9aeb..bf35ec1 100644
--- a/client/rhel/yum-rhn-plugin/rhnplugin.py
+++ b/client/rhel/yum-rhn-plugin/rhnplugin.py
@@ -121,8 +121,9 @@ def init_hook(conduit):
return
if not login_info:
- conduit.error(0, _("This system is not registered with RHN.") +
"\n" +
- RHN_DISABLED)
+ conduit.error(0, _("This system is not registered with RHN Classic or RHN
Satellite.") +
+ "\n" + _("You can use rhn_register to register.") +
+ "\n" + RHN_DISABLED)
rhn_enabled = False
truncateRHNReposCache(conduit)
return
@@ -136,8 +137,9 @@ def init_hook(conduit):
truncateRHNReposCache(conduit)
return
except up2dateErrors.NoSystemIdError:
- conduit.error(0, _("This system may not be a registered to RHN. SystemId
could not be acquired.\n") +
- RHN_DISABLED)
+ conduit.error(0, _("This system may not be a registered to RHN Classic or
RHN Satellite. SystemId could not be acquired.") +
+ "\n" + _("You can use rhn_register to register.") +
+ "\n" + RHN_DISABLED)
rhn_enabled = False
return
except up2dateErrors.RhnServerException, e:
@@ -145,6 +147,9 @@ def init_hook(conduit):
"\n" + unicode(e))
return
+ if rhn_enabled:
+ conduit.info(2, _("This system is receiving updates from RHN Classic or RHN
Satellite."))
+
repos = conduit.getRepos()
conduit_conf = conduit.getConf()
timeout = conduit_conf.timeout
Show replies by date