vendored/puppet/lib/puppet/pops/issues.rb in bolt-0.15.0 vs vendored/puppet/lib/puppet/pops/issues.rb in bolt-0.16.0
- old
+ new
@@ -780,23 +780,29 @@
HIERA_UNDEFINED_VARIABLE = hard_issue :HIERA_UNDEFINED_VARIABLE, :name do
_("Undefined variable '%{name}'") % { name: name }
end
HIERA_BACKEND_MULTIPLY_DEFINED = hard_issue :HIERA_BACKEND_MULTIPLY_DEFINED, :name, :first_line do
- msg = _("Backend '%{name}' is defined more than once") % { name: name }
+ msg = _("Backend '%{name}' is defined more than once.") % { name: name }
fl = first_line
- fl ? _("%{msg}. First defined at line %{line}") % { msg: msg, line: fl } : msg
+ if fl
+ msg += ' ' + _("First defined at %{error_location}") % { error_location: Puppet::Util::Errors.error_location(nil, fl) }
+ end
+ msg
end
HIERA_NO_PROVIDER_FOR_BACKEND = hard_issue :HIERA_NO_PROVIDER_FOR_BACKEND, :name do
_("No data provider is registered for backend '%{name}'") % { name: name }
end
HIERA_HIERARCHY_NAME_MULTIPLY_DEFINED = hard_issue :HIERA_HIERARCHY_NAME_MULTIPLY_DEFINED, :name, :first_line do
- msg = _("Hierarchy name '%{name}' defined more than once") % { name: name }
+ msg = _("Hierarchy name '%{name}' defined more than once.") % { name: name }
fl = first_line
- fl ? _("%{msg}. First defined at line %{line}") % { msg: msg, line: fl } : msg
+ if fl
+ msg += ' ' + _("First defined at %{error_location}") % { error_location: Puppet::Util::Errors.error_location(nil, fl) }
+ end
+ msg
end
HIERA_V3_BACKEND_NOT_GLOBAL = hard_issue :HIERA_V3_BACKEND_NOT_GLOBAL do
_("'hiera3_backend' is only allowed in the global layer")
end
@@ -881,8 +887,12 @@
_("The 'bolt' library is required to %{action}") % { action: action }
end
UNKNOWN_TASK = issue :UNKNOWN_TASK, :type_name do
_('Task not found: %{type_name}') % { type_name: type_name }
+ end
+
+ LOADER_FAILURE = issue :LOADER_FAILURE, :type do
+ _('Failed to load: %{type_name}') % { type: type }
end
end
end