diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2008-05-21 13:59:01 +0800 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2008-06-06 12:22:56 +0200 |
| commit | da8592b14d5924fe982d061bd26147d8c19d1071 (patch) | |
| tree | 3cf7d929c9c38bc02c10dc07ee405b8db6f2558a /cpp/src | |
| parent | http://bugzilla/bugzilla/show_bug.cgi?id=3213 - VC80 requires SP1. VC80 Expre... (diff) | |
| download | ice-da8592b14d5924fe982d061bd26147d8c19d1071.tar.bz2 ice-da8592b14d5924fe982d061bd26147d8c19d1071.tar.xz ice-da8592b14d5924fe982d061bd26147d8c19d1071.zip | |
http://bugzilla/bugzilla/show_bug.cgi?id=3208 - iceca init --overwrite does not work under windows.
Diffstat (limited to 'cpp/src')
| -rwxr-xr-x | cpp/src/ca/iceca | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cpp/src/ca/iceca b/cpp/src/ca/iceca index 0515382123e..a23892830ec 100755 --- a/cpp/src/ca/iceca +++ b/cpp/src/ca/iceca @@ -284,7 +284,7 @@ if sys.argv[script] == "init": # If the CA exists then destroy it. if os.path.exists(os.path.join(home, caroot)): print "Warning: running this command will destroy your existing CA setup!" - choice = raw_input("Do you want to continue? (y/n)") + choice = raw_input("Do you want to continue? (y/n)").strip() if choice != 'y' and choice != 'Y': sys.exit(1) shutil.rmtree(os.path.join(home, caroot)) @@ -334,15 +334,16 @@ if sys.argv[script] == "init": first = False print - input = raw_input("Do you want to keep this as the CA subject name? (y/n) [y]") + input = raw_input("Do you want to keep this as the CA subject name? (y/n) [y]").strip() if input == 'n': for v in DNelements.values(): - v[2] = raw_input(v[1] + ":") + v[2] = raw_input(v[1] + ":").strip() else: break while True: - DNelements['emailAddress'] = ['emailAddress', '', raw_input("Enter the email address of the CA: "), 'optional'] + DNelements['emailAddress'] = ['emailAddress', '', raw_input("Enter the email address of the CA: ").strip(), + 'optional'] if DNelements['emailAddress'][2] and len(DNelements['emailAddress'][2]) > 0: break |