composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-07-10 16:56:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°9648 - Better dependencies error message

Browse Source
This commit is contained in:
Eric Espie
2026-07-10 12:02:12 +02:00
parent 05b8c529fe
commit 7321eeb23f
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
setup/setuputils.class.inc.php
View File

@@ -553,15 +553,12 @@ class SetupUtils
*
* @since 3.0.0 N°2214 replace SetupLog::Log calls by CheckResult::TRACE
*/
public static function CheckSelectedModules($sSourceDir, $sExtensionDir, $aSelectedModules)
public static function CheckSelectedModules(array $aRelDirsToScan, $aSelectedModules)
{
$aResult = [];
$aDirsToScan = [APPROOT.$sSourceDir];
$sExtensionsPath = APPROOT.$sExtensionDir;
if (is_dir($sExtensionsPath)) {
// if the extensions dir exists, scan it for additional modules as well
$aDirsToScan[] = $sExtensionsPath;
$aDirsToScan = [];
foreach ($aRelDirsToScan as $sRelDir) {
$aDirsToScan[] = APPROOT.$sRelDir;
}
require_once(APPROOT.'setup/modulediscovery.class.inc.php');
try {

3
setup/unattended-install/unattended-install.php
View File

@@ -244,7 +244,8 @@ $aChecks = SetupUtils::CheckBackupPrerequisites(APPROOT.'data'); // mmm should b
$aSelectedModules = $oParams->Get('selected_modules');
$sSourceDir = $oParams->Get('source_dir', 'datamodels/latest');
$sExtensionDir = $oParams->Get('extensions_dir', 'extensions');
$aChecks = array_merge($aChecks, SetupUtils::CheckSelectedModules($sSourceDir, $sExtensionDir, $aSelectedModules));
$aRelDirsToScan = [$sSourceDir, $sExtensionDir, "data/$sTargetEnvironment-modules"];
$aChecks = array_merge($aChecks, SetupUtils::CheckSelectedModules($aRelDirsToScan, $aSelectedModules));
foreach ($aChecks as $oCheckResult) {
switch ($oCheckResult->iSeverity) {