diff options
| author | Jose <jose@zeroc.com> | 2014-11-27 18:05:41 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-11-27 18:05:41 +0100 |
| commit | 72ca71f77de0262acc5b0b786f3b07e684a8a4cd (patch) | |
| tree | b7b5fe4a1619359695e2a08265a6d24ba79bf1c5 /cpp/demo/IceStorm/replicated/expect.py | |
| parent | Fixes for ICE-5984 & ICE-5965: binding test warwnings with WS (diff) | |
| download | ice-72ca71f77de0262acc5b0b786f3b07e684a8a4cd.tar.bz2 ice-72ca71f77de0262acc5b0b786f3b07e684a8a4cd.tar.xz ice-72ca71f77de0262acc5b0b786f3b07e684a8a4cd.zip | |
Fixed (ICE-5987) - remove i386 from OS X binaries
Diffstat (limited to 'cpp/demo/IceStorm/replicated/expect.py')
| -rwxr-xr-x | cpp/demo/IceStorm/replicated/expect.py | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/cpp/demo/IceStorm/replicated/expect.py b/cpp/demo/IceStorm/replicated/expect.py index f6da746197a..0b4dc6ff727 100755 --- a/cpp/demo/IceStorm/replicated/expect.py +++ b/cpp/demo/IceStorm/replicated/expect.py @@ -23,19 +23,15 @@ from demoscript import Util import time, signal desc = 'application.xml' -if Util.isNoServices() or Util.isDebugBuild(): - fi = open(desc, "r") - desc = 'tmp_application.xml' - fo = open(desc, "w") - for l in fi: - if l.find('exe="icebox"') != -1: - if Util.isNoServices(): - l = l.replace('exe="icebox"', 'exe="' + Util.getIceBox() + '"') - else: - l = l.replace('exe="icebox"', 'exe="iceboxd.exe"') - fo.write(l) - fi.close() - fo.close() +fi = open(desc, "r") +desc = 'tmp_application.xml' +fo = open(desc, "w") +for l in fi: + if l.find('exe="icebox"') != -1: + l = l.replace('exe="icebox"', 'exe="%s"' % Util.getIceBox()) + fo.write(l) +fi.close() +fo.close() sys.stdout.write("cleaning databases... ") sys.stdout.flush() |