diff --git a/dirac/config/environment.py b/dirac/config/environment.py index d8bc1e2..1ac01ea 100755 --- a/dirac/config/environment.py +++ b/dirac/config/environment.py @@ -57,7 +57,8 @@ def initDIRAC( rootPath, enableDebug = False ): gLogger.initialize( "Web", "/Website" ) gLogger.setLevel( "VERBOSE" ) - from DIRAC import gMonitor, gConfig, rootPath as droot + from DIRAC import gConfig, rootPath as droot + from DIRAC.FrameworkSystem.Client.MonitoringClient import gMonitor from DIRAC.Core.Utilities import CFG from DIRAC.ConfigurationSystem.Client.Helpers import getCSExtensions gMonitor.setComponentType( gMonitor.COMPONENT_WEB ) @@ -152,10 +153,10 @@ def getRelease( rootPath ): def portalVersion( rootPath ): - from DIRAC.Core.Utilities import InstallTools + from DIRAC.FrameworkSystem.Client.ComponentInstaller import gComponentInstaller from DIRAC.ConfigurationSystem.Client.Helpers.CSGlobals import getCSExtensions - result = InstallTools.getInfo( getCSExtensions() ) + result = gComponentInstaller.getInfo( getCSExtensions() ) if not result[ "OK" ]: return getRelease( rootPath ) diff --git a/dirac/lib/webBase.py b/dirac/lib/webBase.py index 6fc1e67..c24885c 100755 --- a/dirac/lib/webBase.py +++ b/dirac/lib/webBase.py @@ -7,9 +7,10 @@ from dirac.lib.webconfig import gWebConfig import dirac.lib.helpers as helpers from pylons import request -from DIRAC import gMonitor, gLogger +from DIRAC import gLogger +from DIRAC.FrameworkSystem.Client.MonitoringClient import gMonitor from DIRAC.ConfigurationSystem.Client.Helpers.CSGlobals import getCSExtensions -from DIRAC.Core.Utilities import InstallTools +from DIRAC.FrameworkSystem.Client.ComponentInstaller import gComponentInstaller def currentPath(): @@ -143,7 +144,7 @@ def getSetups(): return "[%s]" % ",".join( availableSetups ) def getVersion(): - result = InstallTools.getInfo( getCSExtensions() ) + result = gComponentInstaller.getInfo( getCSExtensions() ) if not result[ "OK" ]: return ""