solenv/bin/modules/installer/worker.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 51406e88a93008458cf4a7d4f84aa0b169cb7d0b
Author: Eike Rathke <er...@redhat.com>
AuthorDate: Sat Aug 7 18:16:59 2021 +0200
Commit: Eike Rathke <er...@redhat.com>
CommitDate: Sat Aug 7 19:43:14 2021 +0200
Create destination directory also for non-empty sourcepath directory
Do not attempt to copy anything. This can happen with
instdir/share/extensions being populated from some build (e.g. by
dictionaries) but no extension to be installed.
The result was
ERROR: Can't copy file: /build/core/instdir/share/extensions ->
/build/usr/opt/core/lib/libreoffice/share/extensions
Is a directory at /build/core/solenv/bin/modules/installer/worker.pm line
350.
and the copy() created the destination as 0-length file instead.
The recent changes not copying extensions/packages.txt anymore and
related may have triggered this:
6c487d2d7e8aa5cdef55cbd7bc78058184671d82 Fix and simplify "any bundled
extensions installed" check
626050e86b7d5ca0c3bfc265cc33ce8e9d1bf195 gb_Package_Package must specify a
directory
f267340d300da6318435ed1b2ae48b9f4275e2c4 Remove unused
$(LIBO_SHARE_FOLDER)/extensions/package.txt
Change-Id: I93c1b0867bf234255fdef9d31c447b9b20011e17
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120164
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Jenkins
diff --git a/solenv/bin/modules/installer/worker.pm
b/solenv/bin/modules/installer/worker.pm
index dcdfdce7d28e..8da6b14ba7fe 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -343,7 +343,7 @@ 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) ) {
+ elsif ( -d $sourcepath ) {
`mkdir -p "$destdir$destination"`;
}
else {
