summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-01-31 10:24:32 +0000
committerCaolán McNamara <caolanm@redhat.com>2019-01-31 13:39:15 +0100
commit8fbad2f600cd3ab81e7c1da0e4a2a71ebcac0553 (patch)
tree07460475b60785350d045371d339734e3a1be0df /solenv
parentec35e97338356ffb776cddba22765095221d3894 (diff)
be more lenient wrt patched epm
commit c3ab3df902b9e2ad363d1eca14da8f9f7f1567bb Date: Thu Oct 14 09:53:40 2010 +0200 changed the configure.ac to require "Patched by Libreoffice", which was possibly an error Change-Id: I6f8e302baeed054f36b54f8bfb6f5cad826ee788 Reviewed-on: https://gerrit.libreoffice.org/67199 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'solenv')
-rw-r--r--solenv/bin/modules/installer/epmfile.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index bc6a76ccf44d..b85648d1e702 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -759,7 +759,7 @@ sub set_patch_state
while (<EPMPATCH>)
{
chop;
- if ( $_ =~ /Patched for OpenOffice.org/ ) { $installer::globals::is_special_epm = 1; }
+ if ( $_ =~ /Patched for .*Office/ ) { $installer::globals::is_special_epm = 1; }
}
close (EPMPATCH);