Skip to content
Snippets Groups Projects
Commit 891d746b authored by Marcelo Vogel's avatar Marcelo Vogel Committed by Graeme Stewart
Browse files

Fixed the return of release package versions by lstags for cmake builds...

Fixed the return of release package versions by lstags for cmake builds (ATLASJT-342) (PyUtils-00-14-85-03)

	* bin/lstags: fixed the return of release package versions for cmake builds (ATLASJT-342)
	* branch tag PyUtils-00-14-85-03


Former-commit-id: b2509a9b9c42b23bcbfc3319226a8ec56b3f242d
parent 2996949c
No related branches found
No related tags found
No related merge requests found
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
# #
# $Id: checkxAOD.py 776364 2016-10-04 10:02:46Z wlampl $ # $Id: checkxAOD.py 776363 2016-10-04 10:02:03Z wlampl $
# #
# This is a modified version of PyUtils/bin/checkFile.py. It has been taught # This is a modified version of PyUtils/bin/checkFile.py. It has been taught
# how to sum up the sizes of all the branches belonging to a single xAOD # how to sum up the sizes of all the branches belonging to a single xAOD
# object/container. # object/container.
# #
__version__ = "$Revision: 776364 $" __version__ = "$Revision: 776363 $"
__author__ = "Sebastien Binet <binet@cern.ch>, " \ __author__ = "Sebastien Binet <binet@cern.ch>, " \
"Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>, " \ "Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>, " \
"RD Schaffer R.D.Schaffer@cern.ch" "RD Schaffer R.D.Schaffer@cern.ch"
......
...@@ -38,7 +38,9 @@ def cmake_get_pkg_version(fullPkgName): ...@@ -38,7 +38,9 @@ def cmake_get_pkg_version(fullPkgName):
"""Get version of package in the release""" """Get version of package in the release"""
cpath = os.environ.get('CMAKE_PREFIX_PATH','') cpath = os.environ.get('CMAKE_PREFIX_PATH','')
workDir = os.environ.get('WorkDir_DIR')
for cdir in cpath.split(os.pathsep): for cdir in cpath.split(os.pathsep):
if (workDir and cdir.find(workDir)!=-1): continue
pkgs = read_pkg_file(os.path.join(cdir,'packages.txt')) pkgs = read_pkg_file(os.path.join(cdir,'packages.txt'))
if fullPkgName in pkgs: if fullPkgName in pkgs:
return pkgs[fullPkgName] return pkgs[fullPkgName]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment