client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py | 6 ------
client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py | 4 ++--
2 files changed, 2 insertions(+), 8 deletions(-)
New commits:
commit ee822c2566be4ae1c43ba78d34efe87de5747588
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Mar 25 10:52:12 2010 +0100
registration.privacy_statement is no longer called, so remove privacyText.
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py
b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py
index be12620..30185fd 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py
@@ -260,12 +260,6 @@ def welcomeText():
return s.registration.welcome_message()
-def privacyText():
- s = rhnserver.RhnServer()
-
- return s.registration.privacy_statement()
-
-
def finishMessage(systemId):
s = rhnserver.RhnServer()
return s.registration.finish_message(systemId)
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
b/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
index 8416406..d6c3451 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
@@ -326,7 +326,7 @@ class ChooseServerPage:
# Try to contact the server to see if we have a good cert
try:
setBusyCursor()
- rhnreg.privacyText()
+ rhnreg.welcomeText()
setArrowCursor()
except up2dateErrors.SSLCertificateVerifyFailedError:
setArrowCursor()
@@ -1169,7 +1169,7 @@ class ProvideCertificatePage:
up2dateConfig.save()
# Take the new cert for a spin
try:
- rhnreg.privacyText()
+ rhnreg.welcomeText()
except up2dateErrors.SSLCertificateVerifyFailedError:
server_url = up2dateConfig['serverURL']
#TODO: we could point the user to grab the cert from /pub if its sat
Show replies by date