From d019c6aab57c8f343e81081b38e2bbcbf0ad575c Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Sun, 25 Jun 2023 11:53:26 +0200 Subject: [PATCH] In designflow, re-export LD_LIBRARY_PATH only if there is an ALLIANCE_TOP. --- cumulus/src/designflow/task.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cumulus/src/designflow/task.py b/cumulus/src/designflow/task.py index f13ea2bf..6e5f04e5 100644 --- a/cumulus/src/designflow/task.py +++ b/cumulus/src/designflow/task.py @@ -69,7 +69,13 @@ class ShellEnv ( object ): self.shellEnv[ 'MBK_CATAL_NAME' ] = env.getCATALOG() self.shellEnv[ 'RDS_IN' ] = 'gds' self.shellEnv[ 'RDS_OUT' ] = 'gds' - self.shellEnv[ 'ALLIANCE_TOP' ] = ShellEnv.ALLIANCE_TOP + if ShellEnv.ALLIANCE_TOP: + self.shellEnv[ 'ALLIANCE_TOP' ] = ShellEnv.ALLIANCE_TOP + libPath = ShellEnv.ALLIANCE_TOP + '/lib' + LD_LIBRARY_PATH = os.environ[ 'LD_LIBRARY_PATH' ] + if LD_LIBRARY_PATH != '': + libPath += ':' + LD_LIBRARY_PATH + self.shellEnv[ 'LD_LIBRARY_PATH' ] = libPath def export ( self ): """