diff options
| author | Andras Timar <andras.timar@collabora.com> | 2021-10-22 21:47:31 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-11-08 10:42:15 +0100 |
| commit | 6fb9bf718121d92b5e1d14218267d4d4bb5b4cb6 (patch) | |
| tree | 26160d11d1ae07924aa83a02e2c87f6013e20093 | |
| parent | 4280fd3082b22f3ef79101c31d742c282162cf91 (diff) | |
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.timar@collabora.com>
| -rw-r--r-- | solenv/bin/modules/installer/simplepackage.pm | 2 |
1 files changed, 1 insertions, 1 deletions
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 &&"; } } |