solenv/bin/modules/installer/control.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b2cb093d8bd8fbfa4204cb10daec52ec6c283e04
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Wed Jul 10 16:40:16 2024 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Jul 10 21:48:56 2024 +0200
python3: fix macosx installer
Since a1295cb177295752f8cbfbb49e13d5bb69ed7dc7
"python: upgrade to 3.10.14 (master only)"
because the regex expression no longer matches
"error.cpython-310.opt-1.pyc" with two digits after "error.cpython-3"
Change-Id: I78f566da20e6b591bfa76c36dc69ea3125946d82
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170315
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/solenv/bin/modules/installer/control.pm
b/solenv/bin/modules/installer/control.pm
index 4faff4f39b9f..77e47049d5c2 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -316,7 +316,7 @@ sub check_logfile
$compareline =~ s/Error\.idl//g; # removing all occurrences of
"Error.idl"
$compareline =~ s/Error\.html//g; # removing all occurrences of
"Error.html"
$compareline =~ s/error\.py//g; # removing all occurrences of
"error.py"
- $compareline =~ s/error\.cpython\-3.(\.opt\-.|)\.py[co]//g; #
removing all occurrences of "error-cpython"
+ $compareline =~ s/error\.cpython\-3\d{1,2}(\.opt\-.|)\.py[co]//g; #
removing all occurrences of "error-cpython"
$compareline =~ s/libgpg-error//g;
$compareline =~ s/Error-xref\.html//g;
