summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorJim Jagielski <jim@apache.org>2019-01-23 19:51:08 +0000
committerCaolán McNamara <caolanm@redhat.com>2019-01-31 13:38:58 +0100
commitec35e97338356ffb776cddba22765095221d3894 (patch)
treef7c02eef3667e2d5485748f0a0a061d8b8c2ec53 /solenv
parent2a53f2b5515fffaf1a30b3f5ca2ab89bada574db (diff)
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@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'solenv')
-rw-r--r--solenv/bin/modules/installer.pm9
1 files changed, 8 insertions, 1 deletions
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); }