You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ji...@apache.org on 2020/11/24 13:31:22 UTC
[openoffice] branch trunk updated: This is Perl, not C :-)
This is an automated email from the ASF dual-hosted git repository.
jim pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 01e8994 This is Perl, not C :-)
new 65a53b0 Merge branch 'trunk' of https://gitbox.apache.org/repos/asf/openoffice into trunk
01e8994 is described below
commit 01e899469c75bd2ae7afadbca48733e88e80c37d
Author: Jim Jagielski <ji...@gmail.com>
AuthorDate: Tue Nov 24 08:30:44 2020 -0500
This is Perl, not C :-)
---
main/solenv/bin/modules/installer/epmfile.pm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/main/solenv/bin/modules/installer/epmfile.pm b/main/solenv/bin/modules/installer/epmfile.pm
index 6da14dd..c7f9860 100644
--- a/main/solenv/bin/modules/installer/epmfile.pm
+++ b/main/solenv/bin/modules/installer/epmfile.pm
@@ -847,8 +847,8 @@ sub set_patch_state
while (<EPMPATCH>)
{
chop;
- if ( $_ =~ /Patched for .*OpenOffice/ ) { $installer::globals::is_special_epm = 1; break; }
- if ( $_ =~ /Apache OpenOffice compatible/ ) { $installer::globals::is_special_epm = 1; break; }
+ if ( $_ =~ /Patched for .*OpenOffice/ ) { $installer::globals::is_special_epm = 1; last; }
+ if ( $_ =~ /Apache OpenOffice compatible/ ) { $installer::globals::is_special_epm = 1; last; }
}
close (EPMPATCH);