diff --git a/LbConfiguration/python/LbConfiguration/SP2/lookup.py b/LbConfiguration/python/LbConfiguration/SP2/lookup.py index 31d6b32610118cbeb991b904b32d03e5043204f7..5e5ca426c6ce85d745c167b773bf15f1f1efe9d1 100644 --- a/LbConfiguration/python/LbConfiguration/SP2/lookup.py +++ b/LbConfiguration/python/LbConfiguration/SP2/lookup.py @@ -588,5 +588,4 @@ def getLHCbGrid(platform): if platform.split('-')[1] == os_id: log.warning('using %s instead', platform) break - return version, platform diff --git a/LbConfiguration/python/LbConfiguration/SP2/script.py b/LbConfiguration/python/LbConfiguration/SP2/script.py index 749856daa4f10e697d6b494d4a8ba8e928f19a09..b6e24e30081ee717a30f8055c876801108d56b11 100644 --- a/LbConfiguration/python/LbConfiguration/SP2/script.py +++ b/LbConfiguration/python/LbConfiguration/SP2/script.py @@ -459,13 +459,15 @@ class SP2(EnvConfig.Script): # set the environment XML search path env_path = [] if self.opts.use_grid: - env_path.extend(getEnvXmlPath('LHCbGrid', - *getLHCbGrid(self.opts.platform))) + lhcbgrid_pv = getLHCbGrid(self.opts.platform) + self.log.info('using LHCbGrid/%s %s', *lhcbgrid_pv) + env_path.extend(getEnvXmlPath('LHCbGrid', *lhcbgrid_pv)) for p, v in projects: if p == 'LCG': continue if p: v = expandVersionAlias(p, v, self.opts.platform) + self.log.info('using %s/%s %s', p, v, self.opts.platform) env_path.extend(getEnvXmlPath(p, v, self.opts.platform, self.allow_empty_version and p == self.project)) diff --git a/LbUtils/cmake/EnvConfig/Control.py b/LbUtils/cmake/EnvConfig/Control.py index d0aaedc09b18bdf2c2c5b41f17f70b93eaad7a31..5ae0979bd6c0fe0d2f92d2d144135caeb90ba928 100644 --- a/LbUtils/cmake/EnvConfig/Control.py +++ b/LbUtils/cmake/EnvConfig/Control.py @@ -264,7 +264,7 @@ class Environment(object): if fileName in self.loadedFiles: self.log.debug('ignore %s: already loaded', fileName) return # ignore recursion - self.log.debug('loading %s', fileName) + self.log.info('loading %s', fileName) self.loadedFiles.add(fileName) dot = self.variables['.'] # push the previous value of ${.} onto the stack... @@ -378,4 +378,3 @@ class Environment(object): def __len__(self): return len(self.variables.keys()) -