diff options
Diffstat (limited to 'solenv/bin/modules')
| -rw-r--r-- | solenv/bin/modules/installer/scriptitems.pm | 2 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/simplepackage.pm | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm index ecda4f9a4e0b..cee8b1e0cfe8 100644 --- a/solenv/bin/modules/installer/scriptitems.pm +++ b/solenv/bin/modules/installer/scriptitems.pm @@ -1880,7 +1880,7 @@ sub remove_Languagepacklibraries_from_Installset } $infoline = "\n"; - push( @installer::globals::globallogfileinfo, $infoline); + push( @installer::globals::logfileinfo, $infoline); return \@newitemsarray; } diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index 08f6eacf9e24..314bcef64ee2 100644 --- a/solenv/bin/modules/installer/simplepackage.pm +++ b/solenv/bin/modules/installer/simplepackage.pm @@ -148,12 +148,15 @@ sub register_extensions } close (UNOPKG); - for ( my $j = 0; $j <= $#unopkgoutput; $j++ ) { push( @installer::globals::logfileinfo, "$unopkgoutput[$j]"); } - my $returnvalue = $?; # $? contains the return value of the systemcall if ($returnvalue) { + # Writing content of @unopkgoutput only in the error case into the log file. Sometimes it + # contains strings like "Error" even in the case of success. This causes a packaging error + # when the log file is analyzed at the end, even if there is no real error. + for ( my $j = 0; $j <= $#unopkgoutput; $j++ ) { push( @installer::globals::logfileinfo, "$unopkgoutput[$j]"); } + $infoline = "ERROR: Could not execute \"$systemcall\"!\nExitcode: '$returnvalue'\n"; push( @installer::globals::logfileinfo, $infoline); installer::exiter::exit_program("ERROR: $systemcall failed!", "register_extensions"); |