Review comments applied. Removed changelog. Changed showoutput to verbose.

This commit is contained in:
Chad Maloney 2015-01-05 14:36:00 -06:00
parent a2778c0a6b
commit d2e1500c74
3 changed files with 3 additions and 5 deletions

View File

@ -40,8 +40,6 @@ IMPROVEMENTS:
- synced\_folders/nfs: Won't use `sudo` to write to /etc/exports if there
are write privileges. [GH-2643]
- synced\_folders/smb: Credentials from one SMB will be copied to the rest. [GH-4675]
- synced\_folders/rsync: Added rsync__showoutput option to echo rsync output
to console [GH-4201]
BUG FIXES:

View File

@ -121,7 +121,7 @@ module VagrantPlugins
machine.ui.info(I18n.t(
"vagrant.rsync_folder_excludes", excludes: excludes.inspect))
end
if opts.include?(:showoutput)
if opts.include?(:verbose)
machine.ui.info(I18n.t("vagrant.rsync_showing_output"));
end
@ -130,7 +130,7 @@ module VagrantPlugins
machine.guest.capability(:rsync_pre, opts)
end
if opts.include?(:showoutput)
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}") }

View File

@ -62,7 +62,7 @@ The rsync synced folder type accepts the following options:
pattern. By default, the ".vagrant/" directory is excluded. We recommend
excluding revision control directories such as ".git/" as well.
* `rsync__showoutput` (boolean) - If true, then the output from the rsync
* `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.