lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix deployment of metapackages

Browse Source
This commit is contained in:
Laurent Destailleur 2023-02-28 13:32:00 +01:00
parent afae14d914
commit d3cfa1050e
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/admin/modules.php
View File

@ -205,6 +205,7 @@ if ($action == 'install') {
dol_syslog("Uncompress of module file is a success."); dol_syslog("Uncompress of module file is a success.");
// We check if this is a metapackage
$modulenamearrays = array(); $modulenamearrays = array();
if (dol_is_file($modulenamedir.'/metapackage.conf')) { if (dol_is_file($modulenamedir.'/metapackage.conf')) {
// This is a meta package // This is a meta package
@ -214,6 +215,7 @@ if ($action == 'install') {
$modulenamearrays[$modulename] = $modulename; $modulenamearrays[$modulename] = $modulename;
//var_dump($modulenamearrays);exit; //var_dump($modulenamearrays);exit;
// Lop on each packacge of the metapackage
foreach ($modulenamearrays as $modulenameval) { foreach ($modulenamearrays as $modulenameval) {
if (strpos($modulenameval, '#') === 0) { if (strpos($modulenameval, '#') === 0) {
continue; // Discard comments continue; // Discard comments
@ -227,13 +229,14 @@ if ($action == 'install') {
// Now we install the module // Now we install the module
if (!$error) { if (!$error) {
@dol_delete_dir_recursive($dirins.'/'.$modulenameval); // delete the zip file @dol_delete_dir_recursive($dirins.'/'.$modulenameval); // delete the target directory
dol_syslog("We copy now directory ".$conf->admin->dir_temp.'/'.$tmpdir.'/htdocs/'.$modulenameval." into target dir ".$dirins.'/'.$modulenameval); $submodulenamedir = $conf->admin->dir_temp.'/'.$tmpdir.'/htdocs/'.$modulenameval;
$result = dolCopyDir($modulenamedir, $dirins.'/'.$modulenameval, '0444', 1); dol_syslog("We copy now directory ".$submodulenamedir." into target dir ".$dirins.'/'.$modulenameval);
$result = dolCopyDir($submodulenamedir, $dirins.'/'.$modulenameval, '0444', 1);
if ($result <= 0) { if ($result <= 0) {
dol_syslog('Failed to call dolCopyDir result='.$result." with param ".$modulenamedir." and ".$dirins.'/'.$modulenameval, LOG_WARNING); dol_syslog('Failed to call dolCopyDir result='.$result." with param ".$submodulenamedir." and ".$dirins.'/'.$modulenameval, LOG_WARNING);
$langs->load("errors"); $langs->load("errors");
setEventMessages($langs->trans("ErrorFailToCopyDir", $modulenamedir, $dirins.'/'.$modulenameval), null, 'errors'); setEventMessages($langs->trans("ErrorFailToCopyDir", $submodulenamedir, $dirins.'/'.$modulenameval), null, 'errors');
$error++; $error++;
} }
} }