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

[Andras Timar (via logerrit)]

 solenv/bin/modules/installer/simplepackage.pm |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6fb9bf718121d92b5e1d14218267d4d4bb5b4cb6
Author:     Andras Timar <andras.ti...@collabora.com>
AuthorDate: Fri Oct 22 21:47:31 2021 +0200
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon Nov 8 10:42:15 2021 +0100

    hdiutil flatten/unflatten was removed in macOS 11
    
    Change-Id: If5a1a70f8a7428d81668704f93fa7a1f45058b68
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124825
    Tested-by: Jenkins
    Reviewed-by: Andras Timar <andras.ti...@collabora.com>

diff --git a/solenv/bin/modules/installer/simplepackage.pm 
b/solenv/bin/modules/installer/simplepackage.pm
index e134eb4185ad..b1d3acdf67ac 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -457,7 +457,7 @@ sub create_package
         my $megabytes = 1500;
         $megabytes = 2000 if $ENV{'ENABLE_DEBUG'};
         $systemcall = "cd $localtempdir && hdiutil create -megabytes 
$megabytes -srcfolder $folder $archive -ov -fs HFS+ -volname \"$volume_name\" 
-format UDBZ";
-        if (( $ref ne "" ) && ( $$ref ne "" )) {
+        if (( $ref ne "" ) && ( $$ref ne "" ) && system("hdiutil 2>&1 | grep 
unflatten") == 0) {
             $systemcall .= " && hdiutil unflatten $archive && Rez -a $$ref -o 
$archive && hdiutil flatten $archive &&";
         }
     }