[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Jan 22 23:07:53 UTC 2019


 solenv/bin/modules/installer/epmfile.pm |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 546c42031b7fd06fcaa8ca835026c5495b369a67
Author:     Jim Jagielski <jim at apache.org>
AuthorDate: Tue Jan 22 21:28:26 2019 +0000
Commit:     Jim Jagielski <jim at apache.org>
CommitDate: Tue Jan 22 21:28:26 2019 +0000

    don't be picky about format

diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index f5cdd055e3b4..731452443e03 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -846,7 +846,7 @@ sub set_patch_state
     while (<EPMPATCH>)
     {
         chop;
-        if ( $_ =~ /Patched for OpenOffice.org/ ) { $installer::globals::is_special_epm = 1; }
+        if ( $_ =~ /Patched for .*OpenOffice/ ) { $installer::globals::is_special_epm = 1; }
     }
 
     close (EPMPATCH);


More information about the Libreoffice-commits mailing list