Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix for LbEnv #2369

Merged
merged 3 commits into from
Jul 2, 2024
Merged

fix for LbEnv #2369

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81d5ffb
fix for LbEnv
mesmith75 Jul 1, 2024
3f09b27
Merge branch 'develop' into centos7_fix
mesmith75 Jul 2, 2024
e0ed59b
Merge branch 'develop' into centos7_fix
mesmith75 Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions ganga/GangaLHCb/Lib/Applications/GaudiExec.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ def getEnvScript(self, isLbEnv):
Return the script which wraps the running command in a correct environment
"""
if isLbEnv:
return 'source /cvmfs/lhcb.cern.ch/lib/LbEnv && export BINARY_TAG={PLATFORM}'\
return 'unset LBENV_SOURCED && source /cvmfs/lhcb.cern.ch/lib/LbEnv && export BINARY_TAG={PLATFORM}'\
' && export CMTCONFIG={PLATFORM} && '.format(PLATFORM=self.platform)
else:
return 'export CMTCONFIG=%s; source /cvmfs/lhcb.cern.ch/lib/LbLogin.sh --cmtconfig=%s && ' % (
Expand Down Expand Up @@ -550,12 +550,11 @@ def execCmd(self, cmd):
# I would have preferred to execute all commands against inside `./run` so we have some sane behaviour
# but this requires a build to have been run before we can use this
# command reliably... so we're just going to be explicit

if not path.isfile(path.join(self.directory, 'build.%s' % self.platform, 'run')):
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 = 'source /cvmfs/lhcb.cern.ch/lib/LbEnv && source LbLogin.sh -c %s && make -j%s' % (
initialCommand = 'unset LBENV_SOURCED && source /cvmfs/lhcb.cern.ch/lib/LbEnv && lb-set-platform %s && make -j%s' % (
self.platform, self.nMakeCores)
if self.useApptainer or 'slc6' in self.platform:
try:
Expand Down
Loading