client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py | 3 -
client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py | 2 -
client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py | 22 +++--------
client/rhel/rhn-client-tools/src/up2date_client/tui.py | 4 +-
4 files changed, 11 insertions(+), 20 deletions(-)
New commits:
commit ab00972f7d9d321d3eb04d1a4a4f8d82134e6146
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Feb 12 14:05:09 2010 +0100
Since other is not used in rhnreg.getAvailableChannels anymore, no need to initialize
it.
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 f1c9d3b..b031d3b 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
@@ -805,11 +805,8 @@ def chooseChannelShouldBeShown():
# First and foremost, does the server support eus?
if rhnreg.server_supports_eus():
- global username, password, oragnization
- other = {}
- if organization is not None:
- other['org_id'] = organization
-
+ global username, password
+
channels = rhnreg.getAvailableChannels(username, password)
channels = channels['channels']
@@ -840,11 +837,8 @@ class ChooseChannelPage:
def chooseChannelPagePrepare(self):
- global username, password, organization
- other = {}
- if organization is not None:
- other['org_id'] = organization
-
+ global username, password
+
self.eus_channels = rhnreg.getAvailableChannels(username, password)
self.channels = self.eus_channels['channels']
commit 8026fe92ff1e20df410f023704e86f5689ce91af
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Feb 17 11:42:13 2010 +0100
Parameter other not used at all in rhnreg.getAvailableChannels, remove it from
invocations.
diff --git a/client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py
b/client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py
index 16de077..0e62135 100755
--- a/client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py
+++ b/client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py
@@ -136,8 +136,7 @@ class RegisterKsCli(rhncli.RhnCli):
sys.exit(-1)
channels = rhnreg.getAvailableChannels(self.options.username,
- self.options.password,
- other)
+ self.options.password)
other['channel'] = channels['default_channel']
try:
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 a4d0b2c..2faeb0e 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py
@@ -406,7 +406,7 @@ def registerSystem(username = None, password = None,
-def getAvailableChannels(username, password, other):
+def getAvailableChannels(username, password):
s = rhnserver.RhnServer()
server_arch = up2dateUtils.getArch()
server_version = up2dateUtils.getVersion()
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 710e511..f1c9d3b 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
@@ -810,8 +810,7 @@ def chooseChannelShouldBeShown():
if organization is not None:
other['org_id'] = organization
- channels = rhnreg.getAvailableChannels(username, password,
- other)
+ channels = rhnreg.getAvailableChannels(username, password)
channels = channels['channels']
@@ -846,9 +845,8 @@ class ChooseChannelPage:
if organization is not None:
other['org_id'] = organization
- self.eus_channels = rhnreg.getAvailableChannels(username, password,
- other)
-
+ self.eus_channels = rhnreg.getAvailableChannels(username, password)
+
self.channels = self.eus_channels['channels']
self.receiving_updates = self.eus_channels['receiving_updates']
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 2bfd651..56a846e 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
@@ -598,7 +598,7 @@ class OSReleaseWindow:
toplevel.add(self.channelList, 0, 5)
self.available_channels = rhnreg.getAvailableChannels(
- self.tui.userName, self.tui.password, self.tui.other)
+ self.tui.userName, self.tui.password)
for key, value in self.available_channels['channels'].items():
if key in self.available_channels['receiving_updates']:
@@ -1468,7 +1468,7 @@ class Tui:
if win.name == 'OSReleaseWindow':
channels = rhnreg.getAvailableChannels(self.userName,
- self.password, self.other)
+ self.password)
# If user is not entitled to eus channels or
# if no eus channels are available skip the
# choose channel screen