Merge branch 'master' of https://github.com/petems/vagrant-puppet-ins…

…tall
petems · Jan 21, 2016 · 06b69c2 · 06b69c2
2 parents a004cd0 + 6e03a63
commit 06b69c2
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/vagrant-puppet-install/action/install_puppet.rb b/lib/vagrant-puppet-install/action/install_puppet.rb
@@ -59,7 +59,9 @@ def find_install_script
         end
 
         def default_install_url
-          if windows_guest?
+          if @machine.config.puppet_install.puppet_version.nil?
+            nil
+          elsif windows_guest?
             # No Windows Version yet
           else
             if ( @machine.config.puppet_install.puppet_version == 'latest' || @machine.config.puppet_install.puppet_version.match(/^4\..+/) )