From fb58d6c878be3e6bd585d6f40d5922e82e1ef32f Mon Sep 17 00:00:00 2001 From: Fabio Rehm Date: Wed, 12 Mar 2014 22:47:05 -0300 Subject: [PATCH] core: Get the plugin to work on Vagrant 1.4 nicely --- lib/vagrant-backports/ui.rb | 8 ++++++-- lib/vagrant-lxc/synced_folder.rb | 9 +++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/lib/vagrant-backports/ui.rb b/lib/vagrant-backports/ui.rb index 076ba79..f29c5c0 100644 --- a/lib/vagrant-backports/ui.rb +++ b/lib/vagrant-backports/ui.rb @@ -1,8 +1,12 @@ module Vagrant module UI class Interface - alias :output :info - alias :detail :info + def output(*args) + info(*args) + end + def detail(*args) + info(*args) + end end end end diff --git a/lib/vagrant-lxc/synced_folder.rb b/lib/vagrant-lxc/synced_folder.rb index 49f8e07..0199d6a 100644 --- a/lib/vagrant-lxc/synced_folder.rb +++ b/lib/vagrant-lxc/synced_folder.rb @@ -7,7 +7,7 @@ module Vagrant end def prepare(machine, folders, _opts) - machine.ui.output(I18n.t("vagrant.actions.vm.share_folders.mounting")) + machine.ui.output(I18n.t("vagrant.actions.lxc.share_folders.preparing")) folders.each do |id, data| host_path = Pathname.new(File.expand_path(data[:hostpath], machine.env.root_path)) @@ -15,7 +15,7 @@ module Vagrant if !host_path.directory? && data[:create] # Host path doesn't exist, so let's create it. - @logger.debug("Host path doesn't exist, creating: #{host_path}") + @logger.info("Host path doesn't exist, creating: #{host_path}") begin host_path.mkpath @@ -28,8 +28,9 @@ module Vagrant machine.provider.driver.share_folder(host_path, guest_path) # Guest path specified, so mount the folder to specified point machine.ui.detail(I18n.t("vagrant.actions.vm.share_folders.mounting_entry", - guestpath: data[:guestpath], - hostpath: data[:hostpath])) + guestpath: data[:guestpath], + hostpath: data[:hostpath], + guest_path: data[:guestpath])) end end end