strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS qadev32 (1.16.4); FILE MERGED

Browse source 
2008/06/01 19:52:50 cn 1.16.4.1: #i85368# for windows replace all backslashes with slashes in fileURL
This commit is contained in:
Rüdiger Timm 2008-06-13 11:31:02 +00:00
parent e893cc2137
commit dfe70943d3
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
solenv/bin/modules/installer/simplepackage.pm
View file

@ -8,7 +8,7 @@
#
# $RCSfile: simplepackage.pm,v $
#
# $Revision: 1.16 $
# $Revision: 1.17 $
#
# This file is part of OpenOffice.org.
#
@ -115,7 +115,14 @@ sub register_extensions
if ( ! -f $unopkgfile ) { installer::exiter::exit_program("ERROR: $unopkgfile not found!", "register_extensions"); }
if ( ! -f $oneextension ) { installer::exiter::exit_program("ERROR: $oneextension not found!", "register_extensions"); }
my $systemcall = $unopkgfile . " add --shared --verbose " . $oneextension . " -env:UserInstallation=file://" . $installer::globals::temppath . " 2\>\&1 |";
my $localtemppath = $installer::globals::temppath;
if ( $installer::globals::iswindowsbuild )
{
$windowsslash = "\/";
$localtemppath =~ s/\\/\//g;
$localtemppath = "/".$localtemppath;
}
my $systemcall = $unopkgfile . " add --shared --verbose " . $oneextension . " -env:UserInstallation=file://" . $localtemppath . " 2\>\&1 |";
print "... $systemcall ...\n";
@ -132,7 +139,7 @@ sub register_extensions
if ($returnvalue)
{
$infoline = "ERROR: Could not execute \"$systemcall\"!\n";
$infoline = "ERROR: Could not execute \"$systemcall\"!\nExitcode: '$returnvalue'\n";
push( @installer::globals::logfileinfo, $infoline);
for ( my $j = 0; $j <= $#unopkgoutput; $j++ ) { push( @installer::globals::logfileinfo, "$unopkgoutput[$j]"); }
installer::exiter::exit_program("ERROR: $systemcall failed!", "register_extensions");