summaryrefslogtreecommitdiff
path: root/scripts/IceGridAdmin.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2012-11-28 17:59:50 +0100
committerBenoit Foucher <benoit@zeroc.com>2012-11-28 17:59:50 +0100
commit2dd9a4a85fe5423c0b8a33e5e6afad82ed4665d3 (patch)
tree977c89955218dd21ee9bf9391d24f249c2b74781 /scripts/IceGridAdmin.py
parentICE-5026 incorrect VS2010 x64 lib files (diff)
downloadice-2dd9a4a85fe5423c0b8a33e5e6afad82ed4665d3.tar.bz2
ice-2dd9a4a85fe5423c0b8a33e5e6afad82ed4665d3.tar.xz
ice-2dd9a4a85fe5423c0b8a33e5e6afad82ed4665d3.zip
Fixed ICE-5027 - IceGrid/simple C# test failure with SSL
Diffstat (limited to 'scripts/IceGridAdmin.py')
-rw-r--r--scripts/IceGridAdmin.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/IceGridAdmin.py b/scripts/IceGridAdmin.py
index 2d11c3c5356..e4e83ed632f 100644
--- a/scripts/IceGridAdmin.py
+++ b/scripts/IceGridAdmin.py
@@ -145,7 +145,11 @@ def iceGridNodePropertiesOverride():
if(value.find(' ') == -1):
overrideOptions += ("%s=%s ") % (key, value)
else:
- overrideOptions += ("%s=\\\"%s\\\" ") % (key, value)
+ #
+ # NOTE: We need 2 backslash before the quote to run the
+ # C# test/IceGrid/simple test with SSL.
+ #
+ overrideOptions += ("%s=\\\"%s\\\" ") % (key, value.replace('"', '\\\\\\"'))
return overrideOptions