solenv/bin/modules/installer/worker.pm | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit 9d8c9fbf445a6e118493e8b70241b981f4a0bc49
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Fri Apr 24 15:02:08 2020 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon May 4 19:23:14 2020 +0200
solenv: handle copying empty directories in the installer
'make test-install -o build' fails without this on this branch. It will
be necessary to check if this is still needed on master or not.
Change-Id: Ic62a2c7729402cf45172ccc12fa83b46bee31e78
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93417
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <t...@collabora.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/solenv/bin/modules/installer/worker.pm
b/solenv/bin/modules/installer/worker.pm
index fabac8ff3f46..d002595c69fe 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);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
