[Libreoffice-commits] core.git: solenv/bin

[Libreoffice Gerrit user]

 solenv/bin/modules/installer.pm |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit ec35e97338356ffb776cddba22765095221d3894
Author:     Jim Jagielski <jim at apache.org>
AuthorDate: Wed Jan 23 19:51:08 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jan 31 13:38:58 2019 +0100

    Fix confusing message... if EPM is patched, be sure to log that
    
    (cherry picked from commit e774041ec07d7f168c41a42b6ffa6aacc816d442)
    
    Change-Id: Ie21b6a4a20199e4c7b7ef891719916db4ffba545
    Reviewed-on: https://gerrit.libreoffice.org/67198
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index fff1d90155d9..88ec4e9394f9 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -1155,7 +1155,14 @@ sub run {
                             {
                                 # ... now epm can be started, to create the installation sets
 
-                                installer::logger::print_message( "... starting unpatched epm ... \n" );
+                                if ( $installer::globals::is_special_epm )
+                                {
+                                       installer::logger::print_message( "... starting patched epm ... \n" );
+                                }
+                                else
+                                {
+                                       installer::logger::print_message( "... starting unpatched epm ... \n" );
+                                }
 
                                 if ( $installer::globals::call_epm ) { installer::epmfile::call_epm($epmexecutable, $completeepmfilename, $packagename, $includepatharrayref); }