From d24a0fe1ae5a9f3f33ef73af4c349bb75a475223 Mon Sep 17 00:00:00 2001 From: Robert Date: Mon, 7 Dec 2020 13:45:46 +0100 Subject: [PATCH] single line warnings instead of multi-line --- templates/mod/_require.erb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/templates/mod/_require.erb b/templates/mod/_require.erb index 6a06d68da8..d55e312e9d 100644 --- a/templates/mod/_require.erb +++ b/templates/mod/_require.erb @@ -1,8 +1,7 @@ <% if @requires != nil -%> <%- _requires = @requires -%> <% elsif @allow_from != nil and ! @allow_from.empty? -%> - <%- scope.function_warning(["Class #{@title}: Using Allow"]) -%> - <%- scope.function_warning(["is deprecated in Apache #{@_apache_version}"]) -%> + <%- scope.function_warning(["Class #{@title}: Using Allow is deprecated in Apache #{@_apache_version}"]) -%> <%- _requires = 'ip ' + Array(@allow_from).join(" ") -%> <% else -%> <%- _requires = @requires_defaults -%> @@ -24,8 +23,7 @@ <%- indentation = ' ' -%> <%- else -%> <%- if _requires.has_key?('enforce') -%> - <%- scope.function_warning(["Class #{@title}: Require can only"]) -%> - <%- scope.function_warning(["be overwritten with all, none or any."]) -%> + <%- scope.function_warning(["Class #{@title}: Require can only be overwritten with all, none or any."]) -%> <%- end -%> <%- enforce_open = '' -%> <%- enforce_close = '' -%> @@ -38,7 +36,6 @@ <%- end -%> <%# %><%= enforce_close -%> <%- else -%> - <%- scope.function_warning(["Class #{@title}: Require hash must have"]) -%> - <%- scope.function_warning(["a key named \"requires\" with array value"]) -%> + <%- scope.function_warning(["Class #{@title}: Require hash must have a key named \"requires\" with array value"]) -%> <%- end -%> <% end -%>