Compare commits

..

No commits in common. "bac396a52a198ed707d1f874a3436901993c3ce4" and "0c629a5de55d1bca178b92dc42f3791731d65209" have entirely different histories.

4 changed files with 7 additions and 10 deletions

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
vagrant-hostmanager (1.8.9-1) unstable; urgency=medium
vagrant-hostmanager (1.8.8-1) unstable; urgency=medium
* Initial release (Closes: #898996)

5
debian/control vendored
View File

@ -19,7 +19,4 @@ Depends: ruby | ruby-interpreter,
${shlibs:Depends},
${misc:Depends}
Description: Vagrant plugin for managing /etc/hosts on guests and host
vagrant-hostmanager is a Vagrant plugin that manages the hosts file on guest
machines (and optionally the host). Its goal is to enable resolution of
multi-machine environments deployed with a cloud provider where IP addresses
are not known in advance.
vagrant-hostmanager is a Vagrant plugin that manages the hosts file on guest machines (and optionally the host). Its goal is to enable resolution of multi-machine environments deployed with a cloud provider where IP addresses are not known in advance.

View File

@ -88,8 +88,8 @@ module VagrantPlugins
def update_content(file_content, resolving_machine, include_id, line_endings)
id = include_id ? " id: #{read_or_create_id}" : ""
header = "## vagrant-hostmanager-start#{id}"
footer = "## vagrant-hostmanager-end"
header = "## vagrant-hostmanager-start#{id}\n"
footer = "## vagrant-hostmanager-end\n"
body = get_machines
.map { |machine| get_hosts_file_entry(machine, resolving_machine) }
.join
@ -146,12 +146,12 @@ module VagrantPlugins
if body.empty?
block = "\n"
else
block = "\n\n" + header + "\n" + body + footer + "\n\n"
block = "\n\n" + header + body + footer + "\n"
end
# Pattern for finding existing block
header_pattern = Regexp.quote(header)
footer_pattern = Regexp.quote(footer)
pattern = Regexp.new("[\r\n]*#{header_pattern}.*?#{footer_pattern}[\r\n]*", Regexp::MULTILINE)
pattern = Regexp.new("\n*#{header_pattern}.*?#{footer_pattern}\n*", Regexp::MULTILINE)
# Replace existing block or append
content = old_content.match(pattern) ? old_content.sub(pattern, block) : old_content.rstrip + block
if line_endings == "crlf"

View File

@ -1,5 +1,5 @@
module VagrantPlugins
module HostManager
VERSION = '1.8.9'
VERSION = '1.8.8'
end
end