From 6c8d8eec3f4ad1f85fd10524dad7d57163631ba3 Mon Sep 17 00:00:00 2001 From: Avi Oza Date: Tue, 2 May 2017 19:42:26 -0400 Subject: [PATCH] Change variable to override_base_directory --- lib/vagrant-cachier/action/configure_bucket_root.rb | 8 ++++---- lib/vagrant-cachier/config.rb | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/vagrant-cachier/action/configure_bucket_root.rb b/lib/vagrant-cachier/action/configure_bucket_root.rb index 3fff239..9d360a3 100644 --- a/lib/vagrant-cachier/action/configure_bucket_root.rb +++ b/lib/vagrant-cachier/action/configure_bucket_root.rb @@ -48,16 +48,16 @@ module VagrantPlugins bucket_name = @box_name end # An override directory has been specified. Use this as the base instead of the standard directory - if !@env[:machine].config.cache.override_directory.nil? - base_path = Pathname.new(@env[:machine].config.cache.override_directory) + if !@env[:machine].config.cache.override_base_directory.nil? + base_path = Pathname.new(@env[:machine].config.cache.override_base_directory) else base_path = @env[:home_path] end base_path.join('cache', bucket_name) when :machine # An override directory has been specified. Use this as the base instead of the standard directory - if !@env[:machine].config.cache.override_directory.nil? - base_path = Pathname.new(@env[:machine].config.cache.override_directory) + if !@env[:machine].config.cache.override_base_directory.nil? + base_path = Pathname.new(@env[:machine].config.cache.override_base_directory) base_path += @env[:machine].name.to_s else base_path = @env[:machine].data_dir.parent diff --git a/lib/vagrant-cachier/config.rb b/lib/vagrant-cachier/config.rb index 9ae8dde..1ec74e0 100644 --- a/lib/vagrant-cachier/config.rb +++ b/lib/vagrant-cachier/config.rb @@ -1,7 +1,7 @@ module VagrantPlugins module Cachier class Config < Vagrant.plugin(2, :config) - attr_accessor :scope, :auto_detect, :synced_folder_opts, :override_directory + attr_accessor :scope, :auto_detect, :synced_folder_opts, :override_base_directory attr_reader :buckets ALLOWED_SCOPES = %w( box machine )