[Libreoffice-commits] core.git: solenv/bin

[Christian Lohmaier (via logerrit)]

 solenv/bin/modules/installer/simplepackage.pm |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 6c4cb4e7e0afce2989c9fe596fd74a35eece6206
Author:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
AuthorDate: Fri Jan 22 13:51:52 2021 +0100
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Mon Jan 25 12:51:16 2021 +0100

    mac packaging: capture output of signing call
    
    by replacing system() call with backticks operator, since now the
    macosx-codesign-app-bundle script doesn't redirect the output to
    temp-files anymore (see e2fcbac50549ca96b092d64bd14a37cee6b12e0a)
    That way the output can be added to the log in case of failure.
    
    Change-Id: I954cbb2ed28cfe0f7e1e8ebc8f21aeb1711a4d9a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109816
    Tested-by: Jenkins
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index 01a594a5e72c..f449d1c81044 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -409,13 +409,12 @@ sub create_package
             {
                 $systemcall = "$ENV{'SRCDIR'}/solenv/bin/macosx-codesign-app-bundle $localtempdir/$folder/$volume_name_classic_app.app";
                 print "... $systemcall ...\n";
-                my $returnvalue = system($systemcall);
                 $infoline = "Systemcall: $systemcall\n";
                 push( @installer::globals::logfileinfo, $infoline);
-
-                if ($returnvalue)
+                my $output = `$systemcall 2>&1`;
+                if ($?)
                 {
-                    $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
+                    $infoline = "ERROR: Could not execute \"$systemcall\"!\n$output\n";
                     push( @installer::globals::logfileinfo, $infoline);
                 }
                 else