From ae25587be3a5a424d0019a294607a8cc05bfca96 Mon Sep 17 00:00:00 2001 From: Mark Smith Date: Mon, 15 Jul 2024 21:18:03 +0200 Subject: [PATCH 1/2] fix GaudiExec prepare --- ganga/GangaLHCb/Lib/Applications/GaudiExec.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ganga/GangaLHCb/Lib/Applications/GaudiExec.py b/ganga/GangaLHCb/Lib/Applications/GaudiExec.py index cb9166946c..e832e01f25 100755 --- a/ganga/GangaLHCb/Lib/Applications/GaudiExec.py +++ b/ganga/GangaLHCb/Lib/Applications/GaudiExec.py @@ -554,7 +554,7 @@ def execCmd(self, cmd): initialCommand = 'export CMTCONFIG=%s && export BINARY_TAG=%s && source /cvmfs/lhcb.cern.ch/lib/LbLogin.sh --cmtconfig=%s && make -j%s' % ( self.platform, self.platform, self.platform, self.nMakeCores) if isLbEnv: - initialCommand = 'unset LBENV_SOURCED && source /cvmfs/lhcb.cern.ch/lib/LbEnv && lb-set-platform %s && make -j%s' % ( + initialCommand = 'unset LBENV_SOURCED && source /cvmfs/lhcb.cern.ch/lib/LbEnv -c %s && make -j%s' % ( self.platform, self.nMakeCores) if self.useApptainer or 'slc6' in self.platform: try: @@ -567,6 +567,7 @@ def execCmd(self, cmd): 'Perhaps the specified container location is not accessible.') raise GangaException('Failed to execute make command') else: + print('initial command: ', initialCommand) rc, stdout, stderr = _exec_cmd(initialCommand, self.directory) if rc != 0: logger.error("Failed to perform initial make on a Cmake based project") From 30918e5fd8c4d6319537ca4a5dc73636a76a41ef Mon Sep 17 00:00:00 2001 From: Mark Smith Date: Mon, 15 Jul 2024 21:18:56 +0200 Subject: [PATCH 2/2] tidy --- ganga/GangaLHCb/Lib/Applications/GaudiExec.py | 1 - 1 file changed, 1 deletion(-) diff --git a/ganga/GangaLHCb/Lib/Applications/GaudiExec.py b/ganga/GangaLHCb/Lib/Applications/GaudiExec.py index e832e01f25..e262f470f2 100755 --- a/ganga/GangaLHCb/Lib/Applications/GaudiExec.py +++ b/ganga/GangaLHCb/Lib/Applications/GaudiExec.py @@ -567,7 +567,6 @@ def execCmd(self, cmd): 'Perhaps the specified container location is not accessible.') raise GangaException('Failed to execute make command') else: - print('initial command: ', initialCommand) rc, stdout, stderr = _exec_cmd(initialCommand, self.directory) if rc != 0: logger.error("Failed to perform initial make on a Cmake based project")