diff options
| -rw-r--r-- | solenv/bin/modules/installer.pm | 5 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/windows/mergemodule.pm | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm index d5698cf0e4c3..a081456bed0b 100644 --- a/solenv/bin/modules/installer.pm +++ b/solenv/bin/modules/installer.pm @@ -126,7 +126,8 @@ sub run { # Creating the log directory ###################################### - my $loggingdir = installer::systemactions::create_directories("logging", ""); + my $empty = ""; + my $loggingdir = installer::systemactions::create_directories("logging", \$empty); $loggingdir = $loggingdir . $installer::globals::separator; $installer::globals::exitlog = $loggingdir; @@ -176,7 +177,7 @@ sub run { # FIXME: It would be better to use installer::systemactions::remove_complete_directory # Though, we would need to remove only the lang-specific subdirectory for langpacks and helppacks rmdir $oldloggingdir; - $loggingdir = installer::systemactions::create_directories("logging", ""); + $loggingdir = installer::systemactions::create_directories("logging", \$empty); $loggingdir = $loggingdir . $installer::globals::separator; $installer::globals::exitlog = $loggingdir; diff --git a/solenv/bin/modules/installer/windows/mergemodule.pm b/solenv/bin/modules/installer/windows/mergemodule.pm index 3989e26e408b..8922f7cb83b1 100644 --- a/solenv/bin/modules/installer/windows/mergemodule.pm +++ b/solenv/bin/modules/installer/windows/mergemodule.pm @@ -1101,7 +1101,8 @@ sub change_file_table # Unpacking the MergeModule.CABinet (only once) # Unpacking into temp directory. Warning: expand.exe has problems with very long unpack directories. - my $unpackdir = installer::systemactions::create_directories("cab", ""); + my $empty = ""; + my $unpackdir = installer::systemactions::create_directories("cab", \$empty); push(@installer::globals::removedirs, $unpackdir); $unpackdir = $unpackdir . $installer::globals::separator . $mergemodulegid; |