[DRE-commits] [vagrant-libvirt] 53/67: Remove one branch that can never be taken and comment another that can only be taken in older vagrant

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to annotated tag 0.0.14
in repository vagrant-libvirt.

commit 01d3f28d0dea9819206de99f3334df7b453fac7d
Author: Brian Pitts <brian at polibyte.com>
Date:   Sun Jan 12 14:32:09 2014 -0600

    Remove one branch that can never be taken and comment another that can only be taken in older vagrant
---
 lib/vagrant-libvirt/action/create_networks.rb | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/lib/vagrant-libvirt/action/create_networks.rb b/lib/vagrant-libvirt/action/create_networks.rb
index 1da3a85..4968760 100644
--- a/lib/vagrant-libvirt/action/create_networks.rb
+++ b/lib/vagrant-libvirt/action/create_networks.rb
@@ -67,17 +67,12 @@ module VagrantPlugins
             if @options[:ip]
               @logger.debug "handle by ip"
               handle_ip_option(env)
+            # in vagrant 1.2.3 and later it is not possible to take this branch
+            # bcasue cannot have name without ip
+            # https://github.com/mitchellh/vagrant/commit/cf2f6da4dbcb4f57c9cdb3b94dcd0bba62c5f5fd
             elsif @options[:network_name]
               @logger.debug "handle by name"
               handle_network_name_option
-            else
-              @logger.debug "neither ip nor name specified so finding default"
-              # TODO: Should be smarter than just using fixed 'default' string.
-              @interface_network = lookup_network_by_name('default')
-              if !@interface_network
-                raise Errors::NetworkNotAvailableError,
-                      network_name: 'default'
-              end
             end
 
             autostart_network if !@interface_network[:autostart]

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/vagrant-libvirt.git