File 4314-megaco-App-clean-after-removal-of-all-deprecated-pre.patch of Package erlang
From 8a51dc355d2d567af734f99b7dde4a6e44b74035 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Thu, 19 Mar 2020 18:00:58 +0100
Subject: [PATCH 4/8] [megaco] App clean after removal of all deprecated prev3
codec(s)
Update the app file (removed all (deprecated) prev3 codec(s)).
Also changed the message when setting a removed version3
encoding config (from warning when they where deprecated to
error since they are now removed).
OTP-16560
---
lib/megaco/src/app/megaco.app.src | 21 ---------------------
lib/megaco/src/engine/megaco_config.erl | 6 ++++--
2 files changed, 4 insertions(+), 23 deletions(-)
diff --git a/lib/megaco/src/app/megaco.app.src b/lib/megaco/src/app/megaco.app.src
index e5fdbe0a70..9de3e7c5a4 100644
--- a/lib/megaco/src/app/megaco.app.src
+++ b/lib/megaco/src/app/megaco.app.src
@@ -27,32 +27,20 @@
megaco_ber_encoder,
megaco_ber_media_gateway_control_v1,
megaco_ber_media_gateway_control_v2,
- megaco_ber_media_gateway_control_prev3a,
- megaco_ber_media_gateway_control_prev3b,
- megaco_ber_media_gateway_control_prev3c,
megaco_ber_media_gateway_control_v3,
megaco_binary_encoder,
megaco_binary_encoder_lib,
megaco_binary_name_resolver_v1,
megaco_binary_name_resolver_v2,
- megaco_binary_name_resolver_prev3a,
- megaco_binary_name_resolver_prev3b,
- megaco_binary_name_resolver_prev3c,
megaco_binary_name_resolver_v3,
megaco_binary_term_id,
megaco_binary_term_id_gen,
megaco_binary_transformer_v1,
megaco_binary_transformer_v2,
- megaco_binary_transformer_prev3a,
- megaco_binary_transformer_prev3b,
- megaco_binary_transformer_prev3c,
megaco_binary_transformer_v3,
megaco_compact_text_encoder,
megaco_compact_text_encoder_v1,
megaco_compact_text_encoder_v2,
- megaco_compact_text_encoder_prev3a,
- megaco_compact_text_encoder_prev3b,
- megaco_compact_text_encoder_prev3c,
megaco_compact_text_encoder_v3,
megaco_config,
megaco_config_misc,
@@ -71,16 +59,10 @@
megaco_per_encoder,
megaco_per_media_gateway_control_v1,
megaco_per_media_gateway_control_v2,
- megaco_per_media_gateway_control_prev3a,
- megaco_per_media_gateway_control_prev3b,
- megaco_per_media_gateway_control_prev3c,
megaco_per_media_gateway_control_v3,
megaco_pretty_text_encoder,
megaco_pretty_text_encoder_v1,
megaco_pretty_text_encoder_v2,
- megaco_pretty_text_encoder_prev3a,
- megaco_pretty_text_encoder_prev3b,
- megaco_pretty_text_encoder_prev3c,
megaco_pretty_text_encoder_v3,
megaco_sdp,
megaco_stats,
@@ -95,9 +77,6 @@
megaco_text_mini_parser,
megaco_text_parser_v1,
megaco_text_parser_v2,
- megaco_text_parser_prev3a,
- megaco_text_parser_prev3b,
- megaco_text_parser_prev3c,
megaco_text_parser_v3,
megaco_text_scanner,
megaco_timer,
diff --git a/lib/megaco/src/engine/megaco_config.erl b/lib/megaco/src/engine/megaco_config.erl
index 27d7673d74..d2e364472f 100644
--- a/lib/megaco/src/engine/megaco_config.erl
+++ b/lib/megaco/src/engine/megaco_config.erl
@@ -1542,8 +1542,8 @@ verify_val(Item, Val) ->
encoding_config when is_list(Val) ->
case Val of
[{version3, V3}|_] when (V3 =/= v3) ->
- warning_msg("Encoding Config version3 ~p is deprecated!~n"
- "It will be removed in OTP 24. Use 'v3' instead!"),
+ error_msg("Encoding Config version3 ~p is "
+ "no longer supported!~n"),
ok;
_ ->
ok
@@ -2179,6 +2179,8 @@ warning_msg(F) ->
warning_msg(F, A) ->
?megaco_warning("Config server: " ++ F, A).
+error_msg(F) ->
+ error_msg(F, []).
error_msg(F, A) ->
?megaco_error("Config server: " ++ F, A).
--
2.26.2
