backend/common/rhnException.py | 5 ++---
backend/server/rhnHandler.py | 4 +---
backend/server/rhnUser.py | 4 ++--
client/rhel/yum-rhn-plugin/rhnplugin.py | 2 +-
4 files changed, 6 insertions(+), 9 deletions(-)
New commits:
commit 9528c77bb337e5c9e129ce437374f4ed7282d1c2
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Mar 22 09:40:31 2011 +0100
remove every reference to "up2date --register" - even in comments
diff --git a/backend/server/rhnUser.py b/backend/server/rhnUser.py
index e415fe6..217d740 100644
--- a/backend/server/rhnUser.py
+++ b/backend/server/rhnUser.py
@@ -155,7 +155,7 @@ class User:
if type(value) == type(""):
value = string.strip(value)
# We have to watch over carefully for different field names
- # being sent from rhn_register (up2date --register)
+ # being sent from rhn_register
changed = 0
# translation
@@ -582,7 +582,7 @@ def __new_user_db(username, password, email, org_id, org_password):
if email:
# don't update the user's email address in the satellite context...
- # we *must* in the live context, but user creation through up2date --register
+ # we *must* in the live context, but user creation through rhn_register
# is disallowed in the satellite context anyway...
if not pre_existing_user:
user.set_info("email", email)
diff --git a/client/rhel/yum-rhn-plugin/rhnplugin.py
b/client/rhel/yum-rhn-plugin/rhnplugin.py
index 5f938e2..4f2f308 100644
--- a/client/rhel/yum-rhn-plugin/rhnplugin.py
+++ b/client/rhel/yum-rhn-plugin/rhnplugin.py
@@ -198,7 +198,7 @@ def posttrans_hook(conduit):
def rewordError(e):
#This is compensating for hosted/satellite returning back an error
- #message instructing RHEL5 clients to run "up2date --register"
+ #message instructing RHEL5 clients to run "rhn_register"
#bz: 438175
replacedText = _("Error Message:") + "\n\t" + \
_("Please run rhn_register as root on this client")
commit 67c31380b91902c10f624883d7d7628583c01f0e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Mar 22 09:36:25 2011 +0100
remove text "or up2date --register on Red Hat Enterprise Linux 3 or later"
The rhn_register was RHEL 2.1 thing. Then the functionality was
moved to up2date --register for RHEL 3 and 4. Then up2date was
removed in RHEL 5 and rhn_register was reintroduced.
Make the text simplier.
diff --git a/backend/common/rhnException.py b/backend/common/rhnException.py
index 2976e0f..5fac3f9 100644
--- a/backend/common/rhnException.py
+++ b/backend/common/rhnException.py
@@ -73,7 +73,7 @@ requested information."),
The anonymous server functionality is no longer available.
Please re-register this system by running rhn_register
- (or up2date --register on Red Hat Enterprise Linux 3+) as root.
+ as root.
Please visit https://%(hostname)s/rhn/systems/SystemEntitlements.do
or login at https://%(hostname)s, and from the "Overview" tab,
select "Subscription Management" to enable RHN service for this system.
@@ -257,8 +257,7 @@ maximum membership exceeded"),
# 2000-2999: RHN Satellite specific errors:
2001: _("""
- RHN Satellite user creation is not allowed via rhn_register
- (or up2date --register on Red Hat Enterprise Linux 3 or later);
+ RHN Satellite user creation is not allowed via rhn_register;
please contact your sysadmin to have your account created.
"""),
2002: _("""
diff --git a/backend/server/rhnHandler.py b/backend/server/rhnHandler.py
index d04a204..9d154e9 100644
--- a/backend/server/rhnHandler.py
+++ b/backend/server/rhnHandler.py
@@ -55,9 +55,7 @@ class rhnHandler(RPC_Base):
if not server:
# Invalid server certificate.
raise rhnFault(9, _(
- "Please run rhn_register "
- "(or up2date --register on Red Hat Enterprise Linux 3 or
later)\n"
- "as root on this client"))
+ "Please run rhn_register as root on this client"))
self.server_id = server.getid()
self.server = server
# update the latest checkin time
Show replies by date