diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-05-25 16:27:26 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-05-25 16:27:26 +0200 |
| commit | fcc958bdfeda7287a7f439a627d6c1a6328b8440 (patch) | |
| tree | a37b7a7d0ca8f5aac5779ab92a420244cb870a50 /scripts/Util.py | |
| parent | Fixed sporadic timeout & bridge test failures (diff) | |
| download | ice-fcc958bdfeda7287a7f439a627d6c1a6328b8440.tar.bz2 ice-fcc958bdfeda7287a7f439a627d6c1a6328b8440.tar.xz ice-fcc958bdfeda7287a7f439a627d6c1a6328b8440.zip | |
Added support for --no-ipv6
Diffstat (limited to 'scripts/Util.py')
| -rw-r--r-- | scripts/Util.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index f3117226e04..bfcdb9d6075 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -397,12 +397,15 @@ def parseOptions(obj, options, mapped={}): for (o, a) in options: if o.startswith("--"): o = o[2:] if o.startswith("-"): o = o[1:] + if not a and o.startswith("no-"): + a = "false" + o = o[3:] if o in mapped: o = mapped[o] if hasattr(obj, o): if isinstance(getattr(obj, o), bool): - setattr(obj, o, a.lower() in ("yes", "true", "1") if a else True) + setattr(obj, o, True if not a else (a.lower() in ["yes", "true", "1"])) elif isinstance(getattr(obj, o), list): l = getattr(obj, o) l.append(a) @@ -443,7 +446,7 @@ class Mapping: @classmethod def getSupportedArgs(self): - return ("", ["config=", "platform=", "protocol=", "compress", "ipv6", "serialize", "mx", + return ("", ["config=", "platform=", "protocol=", "compress", "ipv6", "no-ipv6", "serialize", "mx", "cprops=", "sprops="]) @classmethod @@ -546,7 +549,8 @@ class Mapping: v = next(v) if v: if type(v) == bool: - options.append(("--{0}".format(k), None)) + if v: + options.append(("--{0}".format(k), None)) else: options.append(("--{0}".format(k), v)) @@ -554,7 +558,8 @@ class Mapping: for o in self.parsedOptions: v = getattr(self, o) if type(v) == bool: - options.append(("--{0}".format(o), None)) + if v: + options.append(("--{0}".format(o), None)) elif type(v) == list: options += [("--{0}".format(o), e) for e in v] else: |