core: Setup the tmp_path before calling setup_home_path [GH-3095]

CHANGELOG.md

@@ -4,6 +4,8 @@ BUG FIXES:
 
   - core: V1 Vagrantfiles can upgrade provisioners properly. [GH-3092]
   - core: Rare EINVAL errors on box adding are gone. [GH-3094]
+  - core: Upgrading the home directory for Vagrant 1.5 uses the Vagrant
+    temp dir. [GH-3095]
 
 ## 1.5.0 (March 10, 2014)
 

lib/vagrant/environment.rb

@@ -115,12 +115,16 @@ module Vagrant
       @logger.info("  - cwd: #{cwd}")
 
       # Setup the home directory
-      setup_home_path
+      @home_path  ||= Vagrant.user_data_path
+      @home_path  = Util::Platform.fs_real_path(@home_path)
       @boxes_path = @home_path.join("boxes")
       @data_dir   = @home_path.join("data")
       @gems_path  = @home_path.join("gems")
       @tmp_path   = @home_path.join("tmp")
 
+      # Prepare the directories
+      setup_home_path
+
       # Setup the local data directory. If a configuration path is given,
       # then it is expanded relative to the working directory. Otherwise,
       # we use the default which is expanded relative to the root path.
@@ -490,8 +494,6 @@ module Vagrant
     #
     # @return [Pathname]
     def setup_home_path
-      @home_path = Util::Platform.fs_real_path(
-        @home_path || Vagrant.user_data_path)
       @logger.info("Home path: #{@home_path}")
 
       # Setup the list of child directories that need to be created if they