client/rhel/rhn-client-tools/src/up2date_client/tui.py | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
New commits:
commit e90d510b5976093396a6d1ecbb42b3dfede08a79
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Mar 31 13:53:20 2010 +0200
Make sure activate_hardware_info is called before available_eus_channels.
The activate_hardware_info can actually give the account the
entitlements it would need to access z stream/eus.
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 54aaee8..72bf2b5 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
@@ -404,6 +404,14 @@ class OSReleaseWindow:
def __init__(self, screen, tui):
+ self.tui = tui
+ # As OSReleaseWindow seems to be the next window which gets tried
+ # after InfoWindow has verified the login and password, we
+ # can try to activate the hardware asset code here, before
+ # available_eus_channels gets called.
+ if self.tui.serverType == 'hosted':
+ self.tui._activate_hardware()
+
if not rhnreg.server_supports_eus():
log.log_debug("Server does not support EUS, skipping
OSReleaseWindow")
raise WindowSkipException()
@@ -416,7 +424,6 @@ class OSReleaseWindow:
self.name = "OSReleaseWindow"
self.screen = screen
- self.tui = tui
self.size = snack._snack.size()
self.selectChannel = False
@@ -807,9 +814,6 @@ class SendingWindow:
reg_info = None
try:
- if self.tui.serverType == 'hosted':
- self.tui._activate_hardware()
-
# reg_info dict contains: 'system_id', 'channels',
# 'failed_channels', 'slots', 'failed_slots'
log.log_debug('other is %s' % str(self.tui.other))
Show replies by date