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

[Christian Lohmaier (via logerrit)]

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

New commits:
commit 3f72d4d68817210ef6852e83d6d4bbdb540cea18
Author:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
AuthorDate: Wed May 19 15:34:54 2021 +0200
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Wed May 19 19:17:10 2021 +0200

    mac packaging: don't throw away codesign output for langpacks
    
    The change to use backticks to capture the output was already done for
    the main package in 6c4cb4e7e0afce2989c9fe596fd74a35eece6206, this
    change now also fixes it for the langpacks
    
    Change-Id: I26dcfb56342b9c3fc7b9c93f7d586c5c899b7232
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115808
    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 13dc81c0060a..e134eb4185ad 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -392,11 +392,12 @@ sub create_package
             chdir $localfrom;
 
             if ( $ENV{'MACOSX_CODESIGNING_IDENTITY'} ) {
-                my @lp_sign = ('codesign', '--verbose', '--sign', $ENV{'MACOSX_CODESIGNING_IDENTITY'}, '--deep', $appfolder);
-                if (system(@lp_sign) == 0) {
-                    $infoline = "Success: \"@lp_sign\" executed successfully!\n";
+                my $lp_sign = "codesign --verbose --sign $ENV{'MACOSX_CODESIGNING_IDENTITY'} --deep '$appfolder'" ;
+                my $output = `$lp_sign 2>&1`;
+                unless ($?) {
+                    $infoline = "Success: \"$lp_sign\" executed successfully!\n";
                 } else {
-                    $infoline = "ERROR: Could not codesign the languagepack using \"@lp_sign\"!\n";
+                    $infoline = "ERROR: Could not codesign the languagepack using \"$lp_sign\"!\n$output\n";
                 }
                 push( @installer::globals::logfileinfo, $infoline);
             }