haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes #11173: Show guest name in hostname erorr message 

This commit adds the machine guest name in the hostname validation error
message so that it's easier to see which guest in a Vagrantfile has the
validation error.
This commit is contained in:
Brian Cain 2019-11-04 08:41:51 -08:00
parent d27d7d5a2a
commit 0aaa2cc147
No known key found for this signature in database
GPG Key ID: 9FC4639B2E4510A0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/kernel_v2/config/vm.rb
View File

@ -609,7 +609,7 @@ module VagrantPlugins
errors << I18n.t("vagrant.config.vm.clone_and_box") errors << I18n.t("vagrant.config.vm.clone_and_box")
end end
errors << I18n.t("vagrant.config.vm.hostname_invalid_characters") if \ errors << I18n.t("vagrant.config.vm.hostname_invalid_characters", name: machine.name) if \
@hostname && @hostname !~ /^[a-z0-9][-.a-z0-9]*$/i @hostname && @hostname !~ /^[a-z0-9][-.a-z0-9]*$/i
if @box_version if @box_version

2
templates/locales/en.yml
View File

@ -1888,7 +1888,7 @@ en:
box_missing: "A box must be specified." box_missing: "A box must be specified."
clone_and_box: "Only one of clone or box can be specified." clone_and_box: "Only one of clone or box can be specified."
hostname_invalid_characters: |- hostname_invalid_characters: |-
The hostname set for the VM should only contain letters, numbers, The hostname set for the VM '%{name}' should only contain letters, numbers,
hyphens or dots. It cannot start with a hyphen or dot. hyphens or dots. It cannot start with a hyphen or dot.
ignore_provider_config: |- ignore_provider_config: |-
Ignoring provider config for validation... Ignoring provider config for validation...