From: aguerre <aguerre>
Date: Fri, 8 Nov 2013 17:09:15 +0000 (+0000)
Subject: Fix bug in DISTENE licence key (do not trim double colons ::)
X-Git-Tag: BR_hydro_v_0_3_1~19
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b41af670cdef7d4bad9d545e66ab9ecd9a949322;p=modules%2Fkernel.git

Fix bug in DISTENE licence key (do not trim double colons ::)
---

diff --git a/bin/parseConfigFile.py b/bin/parseConfigFile.py
index 8dd21189f..41c294334 100644
--- a/bin/parseConfigFile.py
+++ b/bin/parseConfigFile.py
@@ -167,7 +167,8 @@ def __processConfigFile(config, reserved = [], filename="UNKNOWN FILENAME"):
         pattern = re.compile('\${ ( [^}]* ) }', re.VERBOSE) # string enclosed in ${ and }
         expandedVal = pattern.sub(r'', expandedVal) # remove matching patterns
         # Trim colons
-        expandedVal = _trimColons(expandedVal)
+        if not "DLIM8VAR" in key: # special case: DISTENE licence key can contain double clons (::)
+          expandedVal = _trimColons(expandedVal)
 
         if key in reservedKeys:
           shortKey = key[len(ADD_TO_PREFIX):]