Kaydet (Commit) d199c01e authored tarafından Michael Stahl's avatar Michael Stahl

installer: the perl is borked

Apparently the $$languagesref in create_directories results in the full
path to services.rdb when called from mergemodules.pm as

 my $unpackdir = installer::systemactions::create_directories("cab", "");

... which apparently means that there's some variable whose name is the
empty string and whose value is the path to services.rdb.

Add some mysterious workaround suggested by mmeeks.

Change-Id: I6ba203f5cc44786969795eebab5359d5e9a8a12a
üst c5a7928f
...@@ -126,7 +126,8 @@ sub run { ...@@ -126,7 +126,8 @@ sub run {
# Creating the log directory # 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; $loggingdir = $loggingdir . $installer::globals::separator;
$installer::globals::exitlog = $loggingdir; $installer::globals::exitlog = $loggingdir;
...@@ -176,7 +177,7 @@ sub run { ...@@ -176,7 +177,7 @@ sub run {
# FIXME: It would be better to use installer::systemactions::remove_complete_directory # 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 # Though, we would need to remove only the lang-specific subdirectory for langpacks and helppacks
rmdir $oldloggingdir; rmdir $oldloggingdir;
$loggingdir = installer::systemactions::create_directories("logging", ""); $loggingdir = installer::systemactions::create_directories("logging", \$empty);
$loggingdir = $loggingdir . $installer::globals::separator; $loggingdir = $loggingdir . $installer::globals::separator;
$installer::globals::exitlog = $loggingdir; $installer::globals::exitlog = $loggingdir;
......
...@@ -1101,7 +1101,8 @@ sub change_file_table ...@@ -1101,7 +1101,8 @@ sub change_file_table
# Unpacking the MergeModule.CABinet (only once) # Unpacking the MergeModule.CABinet (only once)
# Unpacking into temp directory. Warning: expand.exe has problems with very long unpack directories. # 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); push(@installer::globals::removedirs, $unpackdir);
$unpackdir = $unpackdir . $installer::globals::separator . $mergemodulegid; $unpackdir = $unpackdir . $installer::globals::separator . $mergemodulegid;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment