From: Serge Rehbinder <serge.rehbinder@cea.fr>
Date: Mon, 17 Oct 2016 14:09:56 +0000 (+0200)
Subject: be able to prepend an env value from APPLICATION.environ
X-Git-Tag: 5.0.0a1~74
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e78f0659aceb8e693fd02b01531215180256543c;p=tools%2Fsat.git

be able to prepend an env value from APPLICATION.environ
---

diff --git a/src/environment.py b/src/environment.py
index 2d2a835..d295a5a 100644
--- a/src/environment.py
+++ b/src/environment.py
@@ -331,7 +331,22 @@ class SalomeEnviron:
         if 'environ' in self.cfg.APPLICATION:
             self.add_comment("APPLICATION environment")
             for p in self.cfg.APPLICATION.environ:
-                self.set(p, self.cfg.APPLICATION.environ[p])
+                val = self.cfg.APPLICATION.environ[p]
+                # "_" means that the value must be prepended
+                if p.startswith("_"):
+                    # separator exception for PV_PLUGIN_PATH
+                    if p[1:] == 'PV_PLUGIN_PATH':
+                        self.prepend(p[1:], val, ';')
+                    else:
+                        self.prepend(p[1:], val)
+                elif p.endswith("_"):
+                    # separator exception for PV_PLUGIN_PATH
+                    if p[:-1] == 'PV_PLUGIN_PATH':
+                        self.append(p[:-1], val, ';')
+                    else:
+                        self.append(p[:-1], val)
+                else:
+                    self.set(p, val)
             self.add_line(1)
 
         # If there is an "environ_script" section, load the scripts