Merge branch 'develop' into apptainer_run

ganga-devs · Apr 23, 2024 · 8ecf969 · 8ecf969
2 parents 0b39f9c + a2465d0
commit 8ecf969
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ganga/GangaLHCb/Lib/Applications/GaudiExec.py b/ganga/GangaLHCb/Lib/Applications/GaudiExec.py
@@ -569,10 +569,10 @@ def execCmd(self, cmd):
             if self.useApptainer or 'slc6' in self.platform:
                 try:
                     logger.info('Building inside apptainer: %s' % self.containerLocation)
-                    cmd_to_run = 'apptainer exec --env "PATH=$PATH" --bind $PWD --bind /cvmfs:/cvmfs:ro '\
+                    cmd_to_run = 'source /cvmfs/lhcb.cern.ch/lib/LbEnv && apptainer exec --env "PATH=$PATH" --bind $PWD --bind /cvmfs:/cvmfs:ro '\
                                  + self.containerLocation + ' ' + cmd_file.name
                     rc, stdout, stderr = _exec_cmd(cmd_to_run, self.directory)
-                except:
+                except BaseException:
                     logger.error('Failed to build the application inside a container. '
                                  'Perhaps the specified container location is not accessible.')
                     raise GangaException('Failed to execute make command')