From 5b42994406f977907fccfdce6e85f5d32d9cd84d Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Thu, 29 Aug 2013 11:45:57 -0700 Subject: [PATCH] core: better cleanup of ".vagrant" --- lib/vagrant/environment.rb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/vagrant/environment.rb b/lib/vagrant/environment.rb index 327e68c27..44de6d596 100644 --- a/lib/vagrant/environment.rb +++ b/lib/vagrant/environment.rb @@ -181,12 +181,18 @@ module Vagrant # If this isn't a directory then it isn't a provider next if !provider_folder.directory? - # If this machine doesn't have an ID, then ignore - next if !provider_folder.join("id").file? + # If this machine doesn't have an ID, then remove the + # directory because it shouldn't exist, and ignore. + if !provider_folder.join("id").file? + provider_folder.rmtree + next + end provider = provider_folder.basename.to_s.to_sym result << [name, provider] end + + name_folder.rmtree if name_folder.children.empty? end # Return the results