client/rhel/rhn-client-tools/src/up2date_client/tui.py | 20 +++--------------
1 file changed, 4 insertions(+), 16 deletions(-)
New commits:
commit a9958b7ed1dd57ae86863fb6173eb39fcd376d5b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Mar 29 14:40:09 2010 +0200
The rhnreg.registerUser (new_user) call is not needed as rhnreg.registerSystem2
validates the login/password as well.
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 9a0a613..bfdef0c 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
@@ -800,18 +800,6 @@ class FinishWindow:
self.pwin.draw()
self.screen.refresh()
- # send the data
- try:
- rhnreg.registerUser(tui.userName, tui.password)
- except up2dateErrors.CommunicationError, e:
- FatalErrorWindow(self.screen, _("Problem registering login
name:\n") + e.errmsg)
- except:
- log.log_exception(*sys.exc_info())
- FatalErrorWindow(self.screen, _("Problem registering login
name."))
-
- self.setScale(1, 5)
-
-
reg_info = None
try:
# reg_info dict contains: 'system_id', 'channels',
@@ -849,7 +837,7 @@ class FinishWindow:
FatalErrorWindow(self.screen,
_("Problem writing out system id to disk."))
- self.setScale(2, 5)
+ self.setScale(1, 4)
# include the info from the oeminfo file as well
self.oemInfo = rhnreg.getOemInfo()
@@ -881,7 +869,7 @@ class FinishWindow:
log.log_exception(*sys.exc_info())
FatalErrorWindow(self.screen, _("Problem registering personal
information"))
- self.setScale(3, 5)
+ self.setScale(2, 4)
# maybe upload hardware profile
if tui.includeHardware:
@@ -895,7 +883,7 @@ class FinishWindow:
FatalErrorWindow(self.screen,
_("Problem sending hardware profile."))
- self.setScale(4, 5)
+ self.setScale(3, 4)
# build up package list if necessary
if tui.includePackages:
@@ -914,7 +902,7 @@ class FinishWindow:
FatalErrorWindow(self.screen, e)
rhnreg.spawnRhnCheckForUI()
- self.setScale(5, 5)
+ self.setScale(4, 4)
# Review Window
rw = ReviewWindow(self.screen, self.tui, reg_info)
Show replies by date