Only look for Vagrantfile if no more specific was given

miketheman · Feb 23, 2013 · 1bda157 · 1bda157
1 parent 082cc7f
commit 1bda157
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/lib/vagrant/environment.rb b/lib/vagrant/environment.rb
@@ -82,8 +82,10 @@ def initialize(opts=nil)
       # Set the Vagrantfile name up. We append "Vagrantfile" and "vagrantfile" so that
       # those continue to work as well, but anything custom will take precedence.
       opts[:vagrantfile_name] ||= []
-      opts[:vagrantfile_name] = [opts[:vagrantfile_name]] if !opts[:vagrantfile_name].is_a?(Array)
+      opts[:vagrantfile_name] = [opts[:vagrantfile_name]] if \
-      opts[:vagrantfile_name] += ["Vagrantfile", "vagrantfile"]
+        !opts[:vagrantfile_name].is_a?(Array)
+      opts[:vagrantfile_name] = ["Vagrantfile", "vagrantfile"] if \
+        opts[:vagrantfile_name].empty?
 
       # Set instance variables for all the configuration parameters.
       @cwd              = opts[:cwd]