diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-11-08 15:33:45 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-11-08 15:46:48 +0100 |
| commit | d199c01ec765c62dee232bc1d6a9929cdbbb5158 (patch) | |
| tree | 9a40d08192a5961681232681bbb9856d1ccbad51 /solenv | |
| parent | c5a7928fb56b9b5d73f7527a8248a28af4895167 (diff) | |
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
Diffstat (limited to 'solenv')
| -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; |