From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Thu, 7 Dec 2017 15:23:11 +0000 (-0500)
Subject: LD_LIBRARY_PATH can already be defined in the runtime environment
X-Git-Url: http://git.efficios.com/?p=deliverable%2Flttng-ivc.git;a=commitdiff_plain;h=ca2f2d5944692ce39004dcd9c311500a9606b778

LD_LIBRARY_PATH can already be defined in the runtime environment

Append any value to it.

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
---

diff --git a/lttng_ivc/utils/project.py b/lttng_ivc/utils/project.py
index f0b7272..23627ee 100644
--- a/lttng_ivc/utils/project.py
+++ b/lttng_ivc/utils/project.py
@@ -120,10 +120,12 @@ class Project(object):
 
         for var, value in self.special_env_variables.items():
             if var in env:
-                # Raise for now since no special cases is known
-                _logger.warning("{} Special var {} is already defined".format(
-                                self.label, var))
-                raise Exception("Multiple definition of a special environment variable")
+                if var == "LD_LIBRARY_PATH":
+                    env[var] = ":".join([env[var], value])
+                else:
+                    _logger.warning("{} Special var {} is already defined".format(
+                                    self.label, var))
+                    raise Exception("Multiple definition of a special environment variable")
             else:
                 env[var] = value