FIX #24201 upload of external module fails to copy from incorrectly generated temp source dir #24340
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…rectly generated temp source dir
eldy
reviewed
Mar 26, 2023
htdocs/admin/modules.php
Outdated
| dol_syslog("We copy now directory ".$submodulenamedir." into target dir ".$dirins.'/'.$modulenameval); | ||
| $result = dolCopyDir($submodulenamedir, $dirins.'/'.$modulenameval, '0444', 1); | ||
| dol_syslog("We copy now directory ".$modulenamedir." into target dir ".$dirins.'/'.$modulenameval); | ||
| $result = dolCopyDir($modulenamedir, $dirins.'/'.$modulenameval, '0444', 1); |
There was a problem hiding this comment.
We are in a loop that process $modulenameval (to be able to manage metapackages)
foreach ($modulenamearrays as $modulenameval) {
If you use $modulenamedir, you always copy the same dir.
If metapackage.conf contains
a
b
c
we must copy dir a into a , then b into b, then c into c.
With your change, source always has value a
It may solve for simple package but break for metapackage.
I think good solution is tho change the line
$submodulenamedir = $conf->admin->dir_temp.'/'.$tmpdir.'/htdocs/'.$modulenameval;
into
$submodulenamedir = $conf->admin->dir_temp.'/'.$tmpdir.'/'.$modulenameval;
if (!dol_is_dir($modulenamedir)) {
$submodulenamedir = $conf->admin->dir_temp.'/'.$tmpdir.'/htdocs/'.$modulenameval;
}
Does this work for you ?
There was a problem hiding this comment.
You're right, I did not take into account the metapackages, the change has been made and tested.
eldy
added
the
Discussion
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.