diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-04-03 13:51:35 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-04-03 13:51:35 +0000 |
| commit | 002d42b9c92b8c5ee3af2881ed15701e35aa4269 (patch) | |
| tree | 5d4775e4139db29d1891262eeb25d2ae70db2ea8 | |
| parent | ed1fe13f59aab5e3faa88c73a223c5599d796d4b (diff) | |
CWS-TOOLING: integrate CWS jl124
2009-04-01 13:35:16 +0200 jl r270322 : #i100555# alway print out unopkg\'s output when invoked while building the installation sets
2009-04-01 13:32:53 +0200 jl r270321 : #i96697# use smard card even if it cannot generate a DES3 key
| -rw-r--r-- | solenv/bin/modules/installer/simplepackage.pm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index d567ac8e61ab..0e5a588d3299 100644 --- a/solenv/bin/modules/installer/simplepackage.pm +++ b/solenv/bin/modules/installer/simplepackage.pm @@ -138,13 +138,14 @@ sub register_extensions while (<UNOPKG>) {push(@unopkgoutput, $_); } 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) { $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"); } else |