diff options
author | Jose <jose@zeroc.com> | 2016-12-01 17:00:18 +0100 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2016-12-01 17:00:18 +0100 |
commit | 5d379090f53a36aaf72f72d00bf591e6d18203ca (patch) | |
tree | 0bac63eb9ede629733c112ac22ed3a229bf81ad1 /scripts/Util.py | |
parent | Fix getIceDir usage (diff) | |
download | ice-5d379090f53a36aaf72f72d00bf591e6d18203ca.tar.bz2 ice-5d379090f53a36aaf72f72d00bf591e6d18203ca.tar.xz ice-5d379090f53a36aaf72f72d00bf591e6d18203ca.zip |
Fix getSliceDir break with previous changes
Diffstat (limited to 'scripts/Util.py')
-rw-r--r-- | scripts/Util.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index 419fa067af5..b7f83a7404f 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -1692,7 +1692,7 @@ class Driver: def useBinDist(self): return os.environ.get("USE_BIN_DIST", "no") == "yes" - def getIceDir(self, mapping=None): + def getIceDir(self, mapping): if self.useBinDist(): return platform.getIceDir(mapping) elif mapping: @@ -1701,7 +1701,7 @@ class Driver: return toplevel def getSliceDir(self, mapping): - return platform.getSliceDir(self.getIceDir(mapping)) + return platform.getSliceDir(self.getIceDir(mapping) if self.useBinDist() else toplevel) def isWorkerThread(self): return False |