diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2020-04-24 15:02:08 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-04-27 19:29:43 +0200 |
| commit | 6dfb8f480e7ff8fdc30e83143edfe5bf6a5e442b (patch) | |
| tree | 02c051524803cd9823f56e5e4cdc5c3013d5a9d8 | |
| parent | 561fe03e429a646411f9dc5e17d48a2f38b1db5a (diff) | |
solenv: handle copying empty directories in the installer
'make test-install -o build' fails without this when
--enable-macosx-sandbox is used. It is harmless in other cases.
Change-Id: Ic62a2c7729402cf45172ccc12fa83b46bee31e78
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92985
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
| -rw-r--r-- | solenv/bin/modules/installer/worker.pm | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm index fabac8ff3f46..dcdfdce7d28e 100644 --- a/solenv/bin/modules/installer/worker.pm +++ b/solenv/bin/modules/installer/worker.pm @@ -343,6 +343,9 @@ sub install_simple ($$$$$$) if ( -l "$sourcepath" ) { symlink (readlink ("$sourcepath"), "$destdir$destination") || die "Can't symlink $destdir$destination -> " . readlink ("$sourcepath") . "$!"; } + elsif ( -d $sourcepath && installer::systemactions::is_empty_dir($sourcepath) ) { + `mkdir -p "$destdir$destination"`; + } else { copy ("$sourcepath", "$destdir$destination") || die "Can't copy file: $sourcepath -> $destdir$destination $!"; my $sourcestat = stat($sourcepath); |