diff --git a/komodo/data/activator_switch.csh.tmpl b/komodo/data/activator_switch.csh.tmpl index 704c8212..fa2f1cb1 100644 --- a/komodo/data/activator_switch.csh.tmpl +++ b/komodo/data/activator_switch.csh.tmpl @@ -12,7 +12,9 @@ if ( `uname -r` =~ *el7* ) then endif setenv KOMODO_RELEASE $KOMODO_RELEASE_REAL else - echo "{{ migration_warning }}" + {%- for line in migration_warning.split('\n') %} + echo "{{ line }}" + {%- endfor %} endif else if ( `uname -r` =~ *el8* ) then setenv KOMODO_ROOT {{ prefix }} diff --git a/komodo/switch.py b/komodo/switch.py index 79647cf4..e1c28262 100644 --- a/komodo/switch.py +++ b/komodo/switch.py @@ -8,7 +8,7 @@ "that is not supported. RHEL7 has been phased out.\n" "From November 2024, komodo versions only support RHEL8.\n" "Please migrate as soon as possible.\n" - "To use the latest stable RHEL7 build use either: " + "To use the latest stable RHEL7 build use either:\n" "source /prog/res/komodo/deprecated-rhel7/enable\n" "source /prog/res/komodo/deprecated-rhel7/enable.csh\n" "\n" diff --git a/tests/test_switch.py b/tests/test_switch.py index a2a11208..57f53190 100644 --- a/tests/test_switch.py +++ b/tests/test_switch.py @@ -60,7 +60,14 @@ def test_write_activator_switches(tmpdir): endif setenv KOMODO_RELEASE $KOMODO_RELEASE_REAL else - echo "{MIGRATION_WARNING}" + echo "Attention! Your machine is running on an environment that is not supported. RHEL7 has been phased out." + echo "From November 2024, komodo versions only support RHEL8." + echo "Please migrate as soon as possible." + echo "To use the latest stable RHEL7 build use either:" + echo "source /prog/res/komodo/deprecated-rhel7/enable" + echo "source /prog/res/komodo/deprecated-rhel7/enable.csh" + echo "" + echo "If you have any questions or issues - contact us on #ert-users on Slack or Equinor's Yammer." endif else if ( `uname -r` =~ *el8* ) then setenv KOMODO_ROOT {prefix}