diff options
author | Martin Nagy <mnagy@notas.(none)> | 2008-07-21 12:25:37 +0200 |
---|---|---|
committer | Simo Sorce <ssorce@redhat.com> | 2008-09-10 15:43:40 -0400 |
commit | 09a473ec45c681b5c26752a9e123222e2c91f9ef (patch) | |
tree | bce66fbb2955194b41839705e48f22347ce7ac7f /ipa-server/ipa-install/ipa-server-certinstall | |
parent | f3d5578b9448de08f678debcad6ae8110d8c20c4 (diff) | |
download | freeipa-09a473ec45c681b5c26752a9e123222e2c91f9ef.tar.gz freeipa-09a473ec45c681b5c26752a9e123222e2c91f9ef.tar.xz freeipa-09a473ec45c681b5c26752a9e123222e2c91f9ef.zip |
Wrap up the raw_input() to user_input() for convenience and uniformity.
Diffstat (limited to 'ipa-server/ipa-install/ipa-server-certinstall')
-rw-r--r-- | ipa-server/ipa-install/ipa-server-certinstall | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/ipa-server/ipa-install/ipa-server-certinstall b/ipa-server/ipa-install/ipa-server-certinstall index e7696270b..84553ff17 100644 --- a/ipa-server/ipa-install/ipa-server-certinstall +++ b/ipa-server/ipa-install/ipa-server-certinstall @@ -24,6 +24,7 @@ import traceback import krbV, ldap, getpass +from ipa.ipautil import user_input from ipaserver import certs, dsinstance, httpinstance, ipaldap, installutils def get_realm_name(): @@ -84,25 +85,15 @@ def choose_server_cert(server_certs): print "%d. %s" % (num, cert[0]) num += 1 - cert_num = 0 while 1: - cert_input = raw_input("Certificate number [1]: ") + num = user_input("Certificate number", 1) print "" - if cert_input == "": - break + if num < 1 or num > len(server_certs): + print "number out of range" else: - try: - num = int(cert_input) - except ValueError: - print "invalid number" - continue - if num > len(server_certs): - print "number out of range" - continue - cert_num = num - 1 break - return server_certs[cert_num] + return server_certs[num - 1] def import_cert(dirname, pkcs12_fname): cdb = certs.CertDB(dirname) |