summaryrefslogtreecommitdiff
path: root/scripts/Util.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2016-11-28 19:09:27 +0100
committerBenoit Foucher <benoit@zeroc.com>2016-11-28 19:09:27 +0100
commit69530abfeac2165324b3abe06cd60bfbd5f84b7f (patch)
tree32bb599df768d0a9d3f7ec9a6b8293256bf9315f /scripts/Util.py
parentPython 3 test suite fixes (diff)
downloadice-69530abfeac2165324b3abe06cd60bfbd5f84b7f.tar.bz2
ice-69530abfeac2165324b3abe06cd60bfbd5f84b7f.tar.xz
ice-69530abfeac2165324b3abe06cd60bfbd5f84b7f.zip
Fixed networkProxy, IceGrid/admin, metrics test failures
Diffstat (limited to 'scripts/Util.py')
-rw-r--r--scripts/Util.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/Util.py b/scripts/Util.py
index cfda99a83de..3809345e684 100644
--- a/scripts/Util.py
+++ b/scripts/Util.py
@@ -464,8 +464,9 @@ class Mapping:
props["Ice.Override.Compress"] = "1"
if self.serialize:
props["Ice.ThreadPool.Server.Serialize"] = "1"
+ props["Ice.IPv6"] = self.ipv6
if self.ipv6:
- props.update({"Ice.IPv6": True, "Ice.PreferIPv6Address": True})
+ props["Ice.PreferIPv6Address"] = True
if self.mx:
props["Ice.Admin.Endpoints"] = "default -h localhost"
props["Ice.Admin.InstanceName"] = "Server" if isinstance(process, Server) else "Client"