descending message wasn't being displayed when the directory itself matched
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3838 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
94c7e0cd1c
commit
a7c465cc9e
1 changed files with 4 additions and 1 deletions
|
@ -5643,7 +5643,7 @@ int CEXEBuild::do_add_file(const char *lgss, int attrib, int recurse, int *total
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (!dir_created && generatecode) {
|
if (!dir_created && generatecode) {
|
||||||
SCRIPT_MSG("%sFile: Descending to: \"%s\"\n", generatecode? "" : "Reserve", dir.c_str());
|
SCRIPT_MSG("%sFile: Descending to: \"%s\"\n", generatecode ? "" : "Reserve", dir.c_str());
|
||||||
|
|
||||||
if (do_add_file_create_dir(dir, basedir, attrib) != PS_OK) {
|
if (do_add_file_create_dir(dir, basedir, attrib) != PS_OK) {
|
||||||
delete dr;
|
delete dr;
|
||||||
|
@ -5682,6 +5682,9 @@ int CEXEBuild::do_add_file(const char *lgss, int attrib, int recurse, int *total
|
||||||
new_spec += spec;
|
new_spec += spec;
|
||||||
} else if (generatecode) {
|
} else if (generatecode) {
|
||||||
// always create directories that match
|
// always create directories that match
|
||||||
|
|
||||||
|
SCRIPT_MSG("%sFile: Descending to: \"%s\"\n", generatecode ? "" : "Reserve", new_spec.c_str());
|
||||||
|
|
||||||
if (do_add_file_create_dir(*dirs_itr, new_dir, attrib) != PS_OK) {
|
if (do_add_file_create_dir(*dirs_itr, new_dir, attrib) != PS_OK) {
|
||||||
delete dr;
|
delete dr;
|
||||||
return PS_ERROR;
|
return PS_ERROR;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue