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

synced_folders/rsync: fix oddness on Windows

This commit is contained in:
Mitchell Hashimoto 2014-04-28 14:48:29 -07:00
parent d7343c5b56
commit 90234dc32f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -57,6 +57,7 @@ BUG FIXES:
- core: Adding a box from a network share on Windows works again. [GH-3279] - core: Adding a box from a network share on Windows works again. [GH-3279]
- commands/rsync-auto: Interrupt exits properly. [GH-3552] - commands/rsync-auto: Interrupt exits properly. [GH-3552]
- commands/rsync-auto: Run properly on Windows. [GH-3547]
- providers/virtualbox: VirtalBox detection works properly again on - providers/virtualbox: VirtalBox detection works properly again on
Windows when the `VBOX_INSTALL_PATH` has multiple elements. [GH-3549] Windows when the `VBOX_INSTALL_PATH` has multiple elements. [GH-3549]
- provisioners/salt: Always copy keys and configs on provision. [GH-3536] - provisioners/salt: Always copy keys and configs on provision. [GH-3536]

5
plugins/synced_folders/rsync/command/rsync_auto.rb
View File

@ -2,8 +2,6 @@ require "log4r"
require 'optparse' require 'optparse'
require "thread" require "thread"
require "listen"
require "vagrant/action/builtin/mixin_synced_folders" require "vagrant/action/builtin/mixin_synced_folders"
require "vagrant/util/busy" require "vagrant/util/busy"
require "vagrant/util/platform" require "vagrant/util/platform"
@ -13,9 +11,10 @@ require_relative "../helper"
# This is to avoid a bug in nio 1.0.0. Remove around nio 1.0.1 # This is to avoid a bug in nio 1.0.0. Remove around nio 1.0.1
if Vagrant::Util::Platform.windows? if Vagrant::Util::Platform.windows?
ENV["NIO4R_PURE"] = "1" ENV["NIO4R_PURE"] = "1"
require "listen"
end end
require "listen"
module VagrantPlugins module VagrantPlugins
module SyncedFolderRSync module SyncedFolderRSync
module Command module Command