diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2008-05-13 18:03:05 +0800 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2008-05-13 18:03:05 +0800 |
| commit | 4c1744f2363ff884e51fcdc986e737c9a9a36467 (patch) | |
| tree | 5adad113d4a9d53e254bf47d8289a96643447d5b /cpp/demo/IceGrid/secure/expect.py | |
| parent | Fixed bug 3156 - Install .pdb files if RELEASEPDBS=yes (diff) | |
| download | ice-4c1744f2363ff884e51fcdc986e737c9a9a36467.tar.bz2 ice-4c1744f2363ff884e51fcdc986e737c9a9a36467.tar.xz ice-4c1744f2363ff884e51fcdc986e737c9a9a36467.zip | |
bug 3163 - IceGrid/secure expect.py changes.
Diffstat (limited to 'cpp/demo/IceGrid/secure/expect.py')
| -rwxr-xr-x | cpp/demo/IceGrid/secure/expect.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/demo/IceGrid/secure/expect.py b/cpp/demo/IceGrid/secure/expect.py index 8d84dba5be7..365262df770 100755 --- a/cpp/demo/IceGrid/secure/expect.py +++ b/cpp/demo/IceGrid/secure/expect.py @@ -39,6 +39,10 @@ if demoscript.Util.defaultHost: else: args = '' +# If this is cygwin add the location of the real python to the PATH. +if demoscript.Util.isCygwin(): + os.environ["PATH"] = demoscript.Util.pythonhome + os.pathsep + os.environ["PATH"] + print "creating certificates...", sys.stdout.flush() makecerts = demoscript.Util.spawn('python makecerts.py') @@ -62,10 +66,6 @@ makecerts.expect("Sign the certificate?") makecerts.sendline("y") makecerts.expect("1 out of 1 certificate requests certified, commit?") makecerts.sendline("y") -makecerts.expect("Enter private key passphrase:") -makecerts.sendline("password") -makecerts.expect("Enter keystore password:") -makecerts.sendline("password") print "ok" print "starting icegrid...", |