summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-09-21 11:44:00 +0200
committerMichael Stahl <mstahl@redhat.com>2013-09-21 19:23:41 +0200
commitc4011eebda9e841fdb1eb195f5925927560e4f29 (patch)
tree2cfdec47ce04b6f938a450b0e0decc23b10da5fb
parenta59b71cb62324c45ea8498ac1943d30328bfcaaa (diff)
installer: actually WINDOWSBASISROOTNAME was wrong
What _actually_ determines the prefix of the destination is the HostName property of the scp2 Directory with Style OFFICEDIRECTORY, so check that. The two are often the same but not when building a LibreOffice_Dev_SDK. Change-Id: Ic127447ef40731f0967b89ece631f9c7b076720f
-rw-r--r--solenv/bin/modules/installer/scriptitems.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index e6c7182e9f8f..b3d106a98860 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -1018,7 +1018,8 @@ sub get_Source_Directory_For_Files_From_Includepathlist
installer::logger::include_header_into_logfile("$item:");
- my $extrarootdir = $allvariables->{'WINDOWSBASISROOTNAME'};
+ my ($foundit, $dontcare, $extrarootdir) =
+ get_office_directory_gid_and_hostname($dirsref);
my $infoline = "";
for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ )
@@ -1045,7 +1046,7 @@ sub get_Source_Directory_For_Files_From_Includepathlist
my $instdirdestination;
if ($destination)
{
- if ($extrarootdir)
+ if (($installer::globals::iswindowsbuild) && $foundit && $extrarootdir)
{
$destination =~ s,$extrarootdir/,,; # remove it from path
}