From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 3 Aug 2006 21:19:13 -0000
Subject: [Cluster-devel] conga/luci/utils luci_admin
Message-ID: <20060803211913.27472.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2006-08-03 21:19:13

Modified files:
	luci/utils     : luci_admin 

Log message:
	fix a typo

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/utils/luci_admin.diff?cvsroot=cluster&r1=1.39&r2=1.40

--- conga/luci/utils/luci_admin	2006/08/03 21:11:35	1.39
+++ conga/luci/utils/luci_admin	2006/08/03 21:19:13	1.40
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-import sys, os, stat, random, crypt, select, string, pwd
+import sys, os, stat, select, string, pwd
 from sys import stderr, argv
 import types
 import xml
@@ -84,11 +84,11 @@
 		termios.tcsetattr(1, termios.TCSADRAIN, orig_attr)
 	except:
 		termios.tcsetattr(1, termios.TCSADRAIN, orig_attr)
+		sys.stderr.write('Error reading passwords.\n')
 		return None
 
 	if passwd != confirm:
-		raise
-		sys.stderr.write('The passwords don\'t match.')
+		sys.stderr.write('The passwords don\'t match.\n')
 		return None
 
 	return passwd
@@ -996,7 +996,6 @@
 
 	password = read_passwd('Enter password: ', 'Confirm password: ')
 	if not password:
-		sys.stderr.write('Error reading password. Exiting.')
 		sys.exit(1)
 	print "Passwords match. Setting the admin password...\n"
 
@@ -1024,7 +1023,6 @@
 
 	password = read_passwd('Enter password: ', 'Confirm password: ')
 	if not password:
-		sys.stderr.write('Error reading password. Exiting.')
 		sys.exit(1)
 	print "Passwords match. Resetting the admin password...\n"