solenv/bin/modules/installer/scriptitems.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 83fc50acf8d9f1fd1166697832d33c154e10654b Author: Christian Lohmaier <[email protected]> AuthorDate: Thu Mar 5 15:06:35 2026 +0100 Commit: Christian Lohmaier <[email protected]> CommitDate: Thu Mar 5 20:46:53 2026 +0100 tdf#169032 fix wrong/missing buildid hash in windows MSI packages while the ini files that are put into instdir are created by instsetoo_native/CustomTarget_setup.mk and work just fine in wsl-as-helper build environment, the files for installation sets are actually created by scp2 and the perl installer code. It fails to get the git hash/the command exits with error, so instead of doing a separate cd command with fancy redirections use git directly with the path argument. Change-Id: I9ced68c5ed9056e8fb140f7bcf1f07691c60115b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201049 Reviewed-by: Christian Lohmaier <[email protected]> Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins (cherry picked from commit 14b2feffbc243e9b38e16ca35c6aaea3f9b28d1a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201061 diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm index 35139fd785e5..555c44c2af2f 100644 --- a/solenv/bin/modules/installer/scriptitems.pm +++ b/solenv/bin/modules/installer/scriptitems.pm @@ -615,7 +615,7 @@ sub replace_setup_variables if ( $localbuild =~ /^\s*(\w+?)(\d+)\s*$/ ) { $localbuild = $2; } # using "680" instead of "src680" - my $buildidstring = `cd $ENV{'SRCDIR'} 2>&1 >/dev/null && git log -n 1 --pretty=format:"%H"`; + my $buildidstring = `git -C $ENV{'SRCDIR'} log -n 1 --pretty=format:"%H"`; if ($? || !$buildidstring) { $buildidstring = $localbuild . "(Build:" . $installer::globals::buildid . ")"; }
