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 2019/01/23 19:51:09 UTC

svn commit: r1851968 - /openoffice/trunk/main/solenv/bin/make_installer.pl

Author: jim
Date: Wed Jan 23 19:51:08 2019
New Revision: 1851968

URL: http://svn.apache.org/viewvc?rev=1851968&view=rev
Log:
Fix confusing message... if EPM is patched, be sure to log that

Modified:
    openoffice/trunk/main/solenv/bin/make_installer.pl

Modified: openoffice/trunk/main/solenv/bin/make_installer.pl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/make_installer.pl?rev=1851968&r1=1851967&r2=1851968&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/make_installer.pl (original)
+++ openoffice/trunk/main/solenv/bin/make_installer.pl Wed Jan 23 19:51:08 2019
@@ -1117,9 +1117,15 @@ sub MakeNonWindowsBuild ($$$$$$$$$$$$$$$
                     if ( $installer::globals::call_epm )
                     {
                         # ... now epm can be started, to create the installation sets
+                        if ( $installer::globals::is_special_epm )
+                        {
+                            $installer::logger::Info->print( "... starting patched epm ... \n" );
+                        }
+                        else
+                        {
+                            $installer::logger::Info->print( "... starting unpatched epm ... \n" );
+                        }
 
-                        $installer::logger::Info->print( "... starting unpatched epm ... \n" );
-                        
                         if ( $installer::globals::call_epm ) { installer::epmfile::call_epm($epmexecutable, $completeepmfilename, $packagename, $includepatharrayref); }
 
                         if (($installer::globals::islinuxrpmbuild) || ($installer::globals::issolarispkgbuild) || ($installer::globals::debian))