[DRE-commits] [vagrant-libvirt] 04/77: Remove code paths for older vagrant.

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to annotated tag 0.0.17
in repository vagrant-libvirt.

commit 2edf4451dc9bb2c2362a2a34907fe58d53003d05
Author: Brian Pitts <brian at polibyte.com>
Date:   Wed Feb 5 10:52:14 2014 -0600

    Remove code paths for older vagrant.
    
    Since previous commits have broken compatiblilty with vagrant versions
    older than 1.4, this commit removes code supporting those versions.
---
 lib/vagrant-libvirt/action.rb | 27 ++++++++-------------------
 lib/vagrant-libvirt/plugin.rb |  4 ++--
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/lib/vagrant-libvirt/action.rb b/lib/vagrant-libvirt/action.rb
index dc28c1c..ab22f27 100644
--- a/lib/vagrant-libvirt/action.rb
+++ b/lib/vagrant-libvirt/action.rb
@@ -30,13 +30,9 @@ module VagrantPlugins
               b2.use StartDomain
               b2.use WaitTillUp
 
-              if Vagrant::VERSION < "1.4.0"
-                b2.use NFS
-              else
-                b2.use PrepareNFSValidIds
-                b2.use SyncedFolderCleanup
-                b2.use SyncedFolders
-              end
+              b2.use PrepareNFSValidIds
+              b2.use SyncedFolderCleanup
+              b2.use SyncedFolders
 
               b2.use ForwardPorts
 
@@ -81,14 +77,9 @@ module VagrantPlugins
               # so wait for dhcp lease and store IP into machines data_dir.
               b3.use WaitTillUp
 
-              # Handle shared folders
-              if Vagrant::VERSION < "1.4.0"
-                b3.use NFS
-              else
-                b3.use PrepareNFSValidIds
-                b3.use SyncedFolderCleanup
-                b3.use SyncedFolders
-              end
+              b3.use PrepareNFSValidIds
+              b3.use SyncedFolderCleanup
+              b3.use SyncedFolders
 
               b3.use ForwardPorts
               b3.use PrepareNFSSettings
@@ -336,10 +327,8 @@ module VagrantPlugins
       autoload :WaitTillUp, action_root.join('wait_till_up')
       autoload :SSHRun,  'vagrant/action/builtin/ssh_run'
       autoload :HandleBoxUrl, 'vagrant/action/builtin/handle_box_url'
-      unless Vagrant::VERSION < "1.4.0"
-        autoload :SyncedFolders, 'vagrant/action/builtin/synced_folders'
-        autoload :SyncedFolderCleanup, 'vagrant/action/builtin/synced_folder_cleanup'
-      end
+      autoload :SyncedFolders, 'vagrant/action/builtin/synced_folders'
+      autoload :SyncedFolderCleanup, 'vagrant/action/builtin/synced_folder_cleanup'
     end
   end
 end
diff --git a/lib/vagrant-libvirt/plugin.rb b/lib/vagrant-libvirt/plugin.rb
index e5530e5..0f275ee 100644
--- a/lib/vagrant-libvirt/plugin.rb
+++ b/lib/vagrant-libvirt/plugin.rb
@@ -6,8 +6,8 @@ end
 
 # This is a sanity check to make sure no one is attempting to install
 # this into an early Vagrant version.
-if Vagrant::VERSION < '1.3.0'
-  raise 'The Vagrant Libvirt plugin is only compatible with Vagrant 1.3+'
+if Vagrant::VERSION < '1.4.0'
+  raise 'The Vagrant Libvirt plugin is only compatible with Vagrant 1.4+'
 end
 
 module VagrantPlugins

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/vagrant-libvirt.git