core.git: Branch 'libreoffice-24-2': "Don't mess with UserInstallation setting of --with-package-format=archive"

[Stephan Bergmann]

FYI, in case anybody relied on the old behavior:

commit 37fb56a1ce031f929067b37c2959b970ff39efd2 (origin/libreoffice-24-2)
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
Date:   Thu Jan 4 21:35:36 2024 +0100

    Don't mess with UserInstallation setting of --with-package-format=archive

Ever since 9043c50f5e284f00a7eadeab5a3add0417c32227 "INTEGRATION: CWS native62

    (1.68.8); FILE MERGED" and its "2006/09/15 14:51:02 is 1.68.8.2: #i67179# 
new
    user dir for all simple-package installation sets" archive installation 
sets had
    set the UserInstallation bootstrap variable to $ORIGIN/../... instead of the
    normal $SYSUSERCONFIG/... that is used for other installation set formats.

However, I see no good reason for that, and it interferes with my current work

    of making the --enable-online-update-mar `make create-update-info` work 
again
    (which builds a mar file from an archive installation set, so contained a
    boostrap ini-file with an unexpected UserInstallation value).

(I don't know about the "installed" installation set format, which also messes

    with the UserInstallation setting, so I left that alone.)

Change-Id: I3bd1e00771a4149922c3ce4e4d187abd3889b4ea

    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161650
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
    (cherry picked from commit 512cc9e8d2be9cdcce0792e44461d0e8ce8c775f)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161637

diff --git a/solenv/bin/modules/installer/simplepackage.pm 
b/solenv/bin/modules/installer/simplepackage.pm
index 86b3da71f440..a8b98a222e5f 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -42,13 +42,13 @@ sub check_simple_packager_project
 {
     my ( $allvariables ) = @_;

- if (( $installer::globals::packageformat eq "installed" ) ||

-        ( $installer::globals::packageformat eq "archive" ))
+    if ( $installer::globals::packageformat eq "installed" )
     {
         $installer::globals::is_simple_packager_project = 1;
         $installer::globals::patch_user_dir = 1;
     }
-    elsif( $installer::globals::packageformat eq "dmg" )
+    elsif(( $installer::globals::packageformat eq "archive" ) ||
+          ( $installer::globals::packageformat eq "dmg" ) )
     {
         $installer::globals::is_simple_packager_project = 1;
     }