diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2009-12-23 12:52:56 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2009-12-23 12:52:56 +0100 |
| commit | 652d3f9252d66b6cfb8c7f8e15c38a048a3a25bc (patch) | |
| tree | f389673ccf7f03ab59462ea5fa558dd98cf2eae8 /cpp/demo/IceGrid/secure/expect.py | |
| parent | More edits for release notes (diff) | |
| download | ice-652d3f9252d66b6cfb8c7f8e15c38a048a3a25bc.tar.bz2 ice-652d3f9252d66b6cfb8c7f8e15c38a048a3a25bc.tar.xz ice-652d3f9252d66b6cfb8c7f8e15c38a048a3a25bc.zip | |
Fixed bug 4537 - IceGrid/secure demoscript failure
Diffstat (limited to 'cpp/demo/IceGrid/secure/expect.py')
| -rwxr-xr-x | cpp/demo/IceGrid/secure/expect.py | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/cpp/demo/IceGrid/secure/expect.py b/cpp/demo/IceGrid/secure/expect.py index 7c0426f45f6..c643599226e 100755 --- a/cpp/demo/IceGrid/secure/expect.py +++ b/cpp/demo/IceGrid/secure/expect.py @@ -34,19 +34,9 @@ if Util.defaultHost: else: args = '' -icecaPath = "" -if os.environ.get("ICE_HOME", "") != "": - icecaPath = os.environ["ICE_HOME"] -elif os.path.isdir(os.path.join(path[0], "cpp")): - icecaPath = os.path.join(path[0], "cpp") - -command = 'python -u makecerts.py' -if icecaPath != "": - command += ' --iceca="%s"' % os.path.join(icecaPath, "bin", "iceca") - print "creating certificates...", sys.stdout.flush() -makecerts = Util.spawn(command) +makecerts = Util.spawn("python -u makecerts.py") makecerts.expect("Do you want to keep this as the CA subject name?") makecerts.sendline("y") makecerts.expect("Enter the email address of the CA:") |