diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-12-06 10:31:14 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-12-06 10:31:14 +0100 |
| commit | 13ed2137508897d5b447f7874bf9795f1929e45b (patch) | |
| tree | 4d0a75351ea09eabddca4b5c3d37a0a563df56ce /scripts/Util.py | |
| parent | Do not generate import libraries with Python builds (diff) | |
| download | ice-13ed2137508897d5b447f7874bf9795f1929e45b.tar.bz2 ice-13ed2137508897d5b447f7874bf9795f1929e45b.tar.xz ice-13ed2137508897d5b447f7874bf9795f1929e45b.zip | |
Fixes for Windows failures
Diffstat (limited to 'scripts/Util.py')
| -rw-r--r-- | scripts/Util.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index 34390c7030f..4d0b20c1930 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -36,7 +36,9 @@ def val(v, escapeQuotes=False, quoteValue=True): if not quoteValue or v.find(" ") < 0: return v elif escapeQuotes: - return "\\\"{0}\\\"".format(v.replace("\\\"", "\\\\\\\"")) + # Work-around for IceGrid bug (ICE-7458) where some characters are escaped when within double-quotes. + #return "\\\"{0}\\\"".format(v.replace("\\\"", "\\\\\\\"")) + return "\\\"{0}\\\"".format(v.replace("\\\"", "\\'")) else: return "\"{0}\"".format(v) else: @@ -1770,9 +1772,10 @@ class CppMapping(Mapping): "IceSSL.CertFile": "server.p12" if isinstance(process, Server) else "client.p12", }) if isinstance(platform, Darwin): + keychainFile = "server.keychain" if isinstance(process, Server) else "client.keychain" props.update({ "IceSSL.KeychainPassword" : "password", - "IceSSL.Keychain": "server.keychain" if isinstance(process, Server) else "client.keychain" + "IceSSL.Keychain": keychainFile }) return props |