From 88683221f465aa121905c542f686ef31980d5ee4 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Mon, 14 Apr 2014 10:18:17 -0700 Subject: [PATCH] synced_folders/rsync: force NIO4R_PURE --- CHANGELOG.md | 2 ++ plugins/synced_folders/rsync/command/rsync_auto.rb | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 984b4556a..bcb137a30 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ ## 1.5.4 (unreleased) +BUG FIXES: + - command/rsync-auto: Works properly on Windows. ## 1.5.3 (April 14, 2014) diff --git a/plugins/synced_folders/rsync/command/rsync_auto.rb b/plugins/synced_folders/rsync/command/rsync_auto.rb index 93bf6ef6d..161fbf184 100644 --- a/plugins/synced_folders/rsync/command/rsync_auto.rb +++ b/plugins/synced_folders/rsync/command/rsync_auto.rb @@ -2,13 +2,19 @@ require "log4r" require 'optparse' require "thread" -require "listen" require "vagrant/action/builtin/mixin_synced_folders" require "vagrant/util/busy" +require "vagrant/util/platform" require_relative "../helper" +# This is to avoid a bug in nio 1.0.0. Remove around nio 1.0.1 +if Vagrant::Util::Platform.windows? + ENV["NIO4R_PURE"] = "1" + require "listen" +end + module VagrantPlugins module SyncedFolderRSync module Command