client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py | 28 -----------
client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py | 22 --------
client/rhel/rhn-client-tools/src/up2date_client/tui.py | 9 ---
3 files changed, 59 deletions(-)
New commits:
commit 88e09834f5250bc4ac282b47e887318099403eca
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Mar 24 15:55:00 2010 +0100
As validateCaps now returns False in all cases, remove its invocations.
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 643e9cf..0ef8db6 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
@@ -378,9 +378,6 @@ class ChooseServerPage:
dialog.run()
return True
- if validateCaps() is True: # There was an error
- return True
-
return False
@@ -1275,9 +1272,6 @@ class ProvideCertificatePage:
errorWindow(_("There was an SSL error. This could be because the
file you picked was not a certificate file."))
return ERROR_WAS_HANDLED
- if validateCaps() is True: # There was an error
- return SERVER_TOO_OLD
-
return CERT_INSTALLED
except IOError, e:
@@ -1776,17 +1770,6 @@ def hasBaseChannelAndUpdates():
return _hasBaseChannelAndUpdates
-def validateCaps():
- """If the server doesn't support the needed capabilities, informs
the user
- and returns True. If it does, returns False. This is kinda backwards, but I
- wanted it to work the same way as most of the other calls.
-
- """
- setBusyCursor()
- setArrowCursor()
- return False
-
-
def setBusyCursor():
"""Dummy function that will be overidden by rhn_register's
standalone gui
and firstboot in different ways.
commit 8e10c995bfa507888279aa006a2e9dcc4e2f4a7f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Mar 17 15:40:15 2010 +0100
Remove serverSupportsRhelFiveCalls: just assume the server supports RHEL 5 calls by
now.
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 5ac55d8..169b610 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py
@@ -847,34 +847,6 @@ def getPossibleOrgs(username, password, useCache=False):
return cachedOrgs
-def serverSupportsRhelFiveCalls():
- """This checks for the new calls we added for rhel 5, some of which
- are required, such as the new system registration calls. I don't know how
- this will work long term, but for now we wanna put this into a build that
- people will probably try to use against servers that don't support the new
- stuff.
- TODO List calls here.
-
- Returns True or False.
-
- """
- # This is a hack.
- # TODO Call new_system_user_pass instead of getPossibleOrg so it works on sats.
- # TODO Make this use nice capabilities infrastructure or something.
- # We only check for get_possible_orgs but we're really also checking for the
- # other calls that were added at the same time.
- try:
- getPossibleOrgs('sdthzdthz233drgdth', 'ztedhzdth2zdbz')
- except up2dateErrors.ValidationError:
- return True
- except up2dateErrors.UnknownMethodException:
- pass
- except:
- log.log_me("An unexcepted error was raised while checking to see if
the"
- " server supports the required calls:")
- log.log_exception(*sys.exc_info())
- return False
-
def spawnRhnCheckForUI():
if os.access("/usr/sbin/rhn_check", os.R_OK|os.X_OK):
from subprocess import Popen, PIPE
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 ce25c52..643e9cf 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
@@ -1783,13 +1783,8 @@ def validateCaps():
"""
setBusyCursor()
- if rhnreg.serverSupportsRhelFiveCalls():
- setArrowCursor()
- return False
- else:
- setArrowCursor()
- errorWindow(rhnreg_constants.SERVER_TOO_OLD)
- return True
+ setArrowCursor()
+ return False
def setBusyCursor():
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
index 0f03a35..46b75e4 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
@@ -146,15 +146,6 @@ class ConnectWindow:
self.screen.popWindow()
- # Next, test for RHEL 5 compatibility.
- if rhnreg.serverSupportsRhelFiveCalls():
- pass
- else:
- FatalErrorWindow(self.screen,
- _("The server you are attempting "
- "to register against does not support this "
- "version of the client."))
-
# Just return next, although the user wouldn't have actually pressed
# anything.
return "next"
Show replies by date