summaryrefslogtreecommitdiff
path: root/solenv/bin/modules/installer/windows
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-11-08 15:33:45 +0100
committerMichael Stahl <mstahl@redhat.com>2013-11-08 15:46:48 +0100
commitd199c01ec765c62dee232bc1d6a9929cdbbb5158 (patch)
tree9a40d08192a5961681232681bbb9856d1ccbad51 /solenv/bin/modules/installer/windows
parentc5a7928fb56b9b5d73f7527a8248a28af4895167 (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/bin/modules/installer/windows')
-rw-r--r--solenv/bin/modules/installer/windows/mergemodule.pm3
1 files changed, 2 insertions, 1 deletions
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;