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

Merge pull request #4867 from malonecm/GH4201-ShowRSyncOutput 

GH-4201: Added rsync__showoutput to display rsync output to console
This commit is contained in:
Seth Vargo 2015-05-30 21:21:26 -07:00
parent 25486f0d41 dd62d3c5f1
commit f9816d89d9
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/synced_folders/rsync/helper.rb
View File

@ -122,13 +122,24 @@ module VagrantPlugins
machine.ui.info(I18n.t( machine.ui.info(I18n.t(
"vagrant.rsync_folder_excludes", excludes: excludes.inspect)) "vagrant.rsync_folder_excludes", excludes: excludes.inspect))
end end
if opts.include?(:verbose)
machine.ui.info(I18n.t("vagrant.rsync_showing_output"));
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)
machine.guest.capability(:rsync_pre, opts) machine.guest.capability(:rsync_pre, opts)
end end
if opts.include?(:verbose)
command_opts[:notify] = [ :stdout, :stderr ];
r = Vagrant::Util::Subprocess.execute(*(command + [command_opts])) {
|io_name,data| data.each_line { |line| machine.ui.info("rsync[#{io_name}] -> #{line}") }
}
else
r = Vagrant::Util::Subprocess.execute(*(command + [command_opts])) r = Vagrant::Util::Subprocess.execute(*(command + [command_opts]))
end
if r.exit_code != 0 if r.exit_code != 0
raise Vagrant::Errors::RSyncError, raise Vagrant::Errors::RSyncError,
command: command.join(" "), command: command.join(" "),

1
templates/locales/en.yml
View File

@ -214,6 +214,7 @@ en:
The provider ('%{provider}') for the machine '%{name}' is The provider ('%{provider}') for the machine '%{name}' is
using a proxy machine. RSync will sync to this proxy using a proxy machine. RSync will sync to this proxy
instead of directly to the environment itself. instead of directly to the environment itself.
rsync_showing_output: "Showing rsync output..."
rsync_ssh_password: |- rsync_ssh_password: |-
The machine you're rsyncing folders to is configured to use The machine you're rsyncing folders to is configured to use
password-based authentication. Vagrant can't script rsync to automatically password-based authentication. Vagrant can't script rsync to automatically

4
website/docs/source/v2/synced-folders/rsync.html.md
View File

@ -62,6 +62,10 @@ The rsync synced folder type accepts the following options:
pattern. By default, the ".vagrant/" directory is excluded. We recommend pattern. By default, the ".vagrant/" directory is excluded. We recommend
excluding revision control directories such as ".git/" as well. excluding revision control directories such as ".git/" as well.
* `rsync__verbose` (boolean) - If true, then the output from the rsync
process will be echoed to the console. The output of rsync is subject
to rsync__args of course. By default, this is false.
## Example ## Example
The following is an example of using RSync to sync a folder: The following is an example of using RSync to sync a folder: