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

synced_folders/rsync: output what is being excluded

This commit is contained in:
Mitchell Hashimoto 2014-01-10 18:06:16 -08:00
parent 60f3d224c9
commit 55b0dffd36
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/synced_folders/rsync/synced_folder.rb
View File

@ -50,7 +50,7 @@ module VagrantPlugins
# Exclude some files by default, and any that might be configured # Exclude some files by default, and any that might be configured
# by the user. # by the user.
excludes = ['.vagrant/'] excludes = ['.vagrant/']
excludes += Array(opts[:exclude]) if opts[:exclude] excludes += Array(opts[:exclude]).map(&:to_s) if opts[:exclude]
excludes.uniq! excludes.uniq!
# Build up the actual command to execute # Build up the actual command to execute
@ -71,6 +71,10 @@ module VagrantPlugins
machine.ui.info(I18n.t( machine.ui.info(I18n.t(
"vagrant.rsync_folder", guestpath: guestpath, hostpath: hostpath)) "vagrant.rsync_folder", guestpath: guestpath, hostpath: hostpath))
if excludes.length > 1
machine.ui.info(I18n.t(
"vagrant.rsync_folder_excludes", excludes: excludes.inspect))
end
# If we have tasks to do before rsyncing, do those. # If we have tasks to do before rsyncing, do those.
if machine.guest.capability?(:rsync_pre) if machine.guest.capability?(:rsync_pre)

1
templates/locales/en.yml
View File

@ -82,6 +82,7 @@ en:
Running cleanup tasks for '%{name}' provisioner... Running cleanup tasks for '%{name}' provisioner...
rsync_folder: |- rsync_folder: |-
Rsyncing folder: %{hostpath} => %{guestpath} Rsyncing folder: %{hostpath} => %{guestpath}
rsync_folder_excludes: " - Exclude: %{excludes}"
ssh_exec_password: |- ssh_exec_password: |-
The machine you're attempting to SSH into is configured to use The machine you're attempting to SSH into is configured to use
password-based authentication. Vagrant can't script entering the password-based authentication. Vagrant can't script entering the