From 8b51613c44f1a41aec92596a5e51ec39fea70b1e Mon Sep 17 00:00:00 2001 From: Marco Clemencic <marco.clemencic@cern.ch> Date: Tue, 27 Jun 2017 15:55:17 +0200 Subject: [PATCH 1/2] Print project version and platform in lb-run for --verbose --- LbConfiguration/python/LbConfiguration/SP2/lookup.py | 1 - LbConfiguration/python/LbConfiguration/SP2/script.py | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/LbConfiguration/python/LbConfiguration/SP2/lookup.py b/LbConfiguration/python/LbConfiguration/SP2/lookup.py index 31d6b326..5e5ca426 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 749856da..b6e24e30 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)) -- GitLab From 042c0250748b495a288d5131b2c6f28747268258 Mon Sep 17 00:00:00 2001 From: Marco Clemencic <marco.clemencic@cern.ch> Date: Tue, 27 Jun 2017 16:18:56 +0200 Subject: [PATCH 2/2] Modified xenv to print the included XML files with --verbose --- LbUtils/cmake/EnvConfig/Control.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/LbUtils/cmake/EnvConfig/Control.py b/LbUtils/cmake/EnvConfig/Control.py index d0aaedc0..5ae0979b 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()) - -- GitLab