client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 90bdf59a026c0e5b2c6ca350261836899972e88f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Mar 25 15:52:39 2010 +0100
Run the getCaps instead of direct welcomeText.
This should do the same good job of verifying the network
connection and certificate, while also setting the capabilities.
This will save one registration.welcome_message call.
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 d6c3451..d410006 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,9 @@ class ChooseServerPage:
# Try to contact the server to see if we have a good cert
try:
setBusyCursor()
- rhnreg.welcomeText()
+ # get the caps info before we show the activastion page which needs the
+ # caps. _but_ we need to do this after we configure the network...
+ rhnreg.getCaps()
setArrowCursor()
except up2dateErrors.SSLCertificateVerifyFailedError:
setArrowCursor()
@@ -494,9 +496,6 @@ class LoginPage:
"""Returns False if everything's ok, True if there was a
problem."""
try:
setBusyCursor()
- # get the caps info before we show the activastion page which needs the
- # caps. _but_ we need to do this after we configure the network...
- rhnreg.getCaps()
self.alreadyRegistered = 1
self.alreadyRegistered = rhnreg.reserveUser(self.loginUname.get_text(),
self.loginPw.get_text())
Show replies by date