diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2020-04-24 15:02:08 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-05-06 22:26:33 +0200 |
| commit | a27ec73e08f867e2c9bedb5d038d60e42c44f566 (patch) | |
| tree | a60aeac870fe7b7b795e3e5e7223dfd0012567c0 /solenv | |
| parent | 30ef27a4c47f9ebb2f353dfc1f6edb7a5ca4f011 (diff) | |
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 <tml@collabora.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'solenv')
| -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..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); |