composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-22 18:18:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°5211 - Core update not working with auto-selected modules

Browse Source
This commit is contained in:
Eric Espie
2022-06-08 10:12:19 +02:00
parent 34bed5ec4f
commit cdd7dcdc5c
2 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
datamodels/2.x/itop-core-update/src/Service/RunTimeEnvironmentCoreUpdater.php
View File

@@ -138,19 +138,7 @@ class RunTimeEnvironmentCoreUpdater extends RunTimeEnvironment
{
throw new Exception("The source directory '$sSourceDirFull' does not exist (or could not be read)");
}
$aDirsToCompile = array($sSourceDirFull);
if (is_dir(APPROOT.'extensions'))
{
$aDirsToCompile[] = APPROOT.'extensions';
}
$sExtraDir = APPROOT.'data/'.$this->sTargetEnv.'-modules/';
if (is_dir($sExtraDir))
{
$aDirsToCompile[] = $sExtraDir;
}
$aExtraDirs = $this->GetExtraDirsToScan($aDirsToCompile);
$aDirsToCompile = array_merge($aDirsToCompile, $aExtraDirs);
$aDirsToCompile = [$sSourceDirFull];
$oFactory = new ModelFactory($aDirsToCompile);
$aModules = $oFactory->FindModules();

4
setup/modelfactory.class.inc.php
View File

@@ -944,9 +944,9 @@ class ModelFactory
$aLoadedModuleNames = array();
foreach (self::$aLoadedModules as $oModule)
{
$aLoadedModuleNames[] = $oModule->GetName();
$aLoadedModuleNames[] = $oModule->GetName().':'.$oModule->GetVersion();
}
throw new Exception('Error loading module "'.$oModule->GetName().'": '.$e->getMessage().' - Loaded modules: '.implode(',',
throw new Exception('Error loading module "'.$oModule->GetName().'": '.$e->getMessage().' - Loaded modules: '.implode(', ',
$aLoadedModuleNames));
}
}