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

[Libreoffice Gerrit user]

 solenv/bin/make_installer.pl |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit e774041ec07d7f168c41a42b6ffa6aacc816d442
Author:     Jim Jagielski <jim at apache.org>
AuthorDate: Wed Jan 23 19:51:08 2019 +0000
Commit:     Jim Jagielski <jim at apache.org>
CommitDate: Wed Jan 23 19:51:08 2019 +0000

    Fix confusing message... if EPM is patched, be sure to log that

diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index cce6c29f9a9e..b250735d0733 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -1117,8 +1117,14 @@ sub MakeNonWindowsBuild ($$$$$$$$$$$$$$$)
                     if ( $installer::globals::call_epm )
                     {
                         # ... now epm can be started, to create the installation sets
-
-                        $installer::logger::Info->print( "... starting unpatched epm ... \n" );
+                        if ( $installer::globals::is_special_epm )
+                        {
+                            $installer::logger::Info->print( "... starting patched epm ... \n" );
+                        }
+                        else
+                        {
+                            $installer::logger::Info->print( "... starting unpatched epm ... \n" );
+                        }
 
                         if ( $installer::globals::call_epm ) { installer::epmfile::call_epm($epmexecutable, $completeepmfilename, $packagename, $includepatharrayref); }