diff options
| author | Eike Rathke <erack@redhat.com> | 2021-08-07 18:16:59 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2021-08-07 19:43:14 +0200 |
| commit | 51406e88a93008458cf4a7d4f84aa0b169cb7d0b (patch) | |
| tree | 154ceb02d1fd25b9632002371d7e6da93dad0735 /solenv | |
| parent | ca481ac2ec7e89b1be4c5a7f14ef242a77cf24cb (diff) | |
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 <erack@redhat.com>
Tested-by: Jenkins
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/worker.pm | 2 |
1 files changed, 1 insertions, 1 deletions
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 { |