diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-10-26 16:41:41 +0100 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2015-10-26 17:42:30 +0000 |
| commit | 7bcd8ed0faaefb8fe3783d6e31dea5c727eddc2a (patch) | |
| tree | ebd42677600b1cc8e1f0a5edbd362390e6a3d8ae /solenv | |
| parent | 6948c546fdc00dddec7d58e03150dcc87921d6b2 (diff) | |
solenv: try to fix installer erroneous error detection of python3.5
... which (on Mac) has files named "error.cpython-35.opt-1.pyc",
"error.cpython-35.opt-2.pyc", and "error.cpython-35.pyc".
Change-Id: I24cea3c7d2aacbda5e39224a975e1c6b34a57244
Reviewed-on: https://gerrit.libreoffice.org/19608
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/control.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm index fd84a3b56577..16d398b1a2ef 100644 --- a/solenv/bin/modules/installer/control.pm +++ b/solenv/bin/modules/installer/control.pm @@ -324,7 +324,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-33\.py[oc]//g; # removing all occurrences of "error-cpython" + $compareline =~ s/error\.cpython\-3.(\.opt\-.|)\.py[co]//g; # removing all occurrences of "error-cpython" $compareline =~ s/libgpg-error-0.dll//g; $compareline =~ s/Error-xref\.html//g; |