[DRE-commits] [vagrant-libvirt] 47/67: Corrected a wrongly spelled key and added domain_name to the error output

[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 b4993072a84e47fe95022fe042d08c550e0461d9
Author: Matt <mattator at gmail.com>
Date:   Tue Jan 7 14:08:49 2014 +0100

    Corrected a wrongly spelled key and added domain_name to the error output
---
 lib/vagrant-libvirt/action/set_name_of_domain.rb | 9 +++++++--
 lib/vagrant-libvirt/errors.rb                    | 2 +-
 locales/en.yml                                   | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/vagrant-libvirt/action/set_name_of_domain.rb b/lib/vagrant-libvirt/action/set_name_of_domain.rb
index 30fc5b4..a778e9f 100644
--- a/lib/vagrant-libvirt/action/set_name_of_domain.rb
+++ b/lib/vagrant-libvirt/action/set_name_of_domain.rb
@@ -5,6 +5,7 @@ module VagrantPlugins
       # Setup name for domain and domain volumes.
       class SetNameOfDomain
         def initialize(app, env)
+          @logger     = Log4r::Logger.new("vagrant_libvirt::action::set_name_of_domain")
           @app = app
         end
 
@@ -14,12 +15,16 @@ module VagrantPlugins
           env[:domain_name].gsub!(/[^-a-z0-9_]/i, '')
           env[:domain_name] << '_'
           env[:domain_name] << env[:machine].name.to_s
-
+          
+          @logger.info("Looking for domain #{env[:domain_name]} through list #{env[:libvirt_compute].servers.all}")
           # Check if the domain name is not already taken
           domain = ProviderLibvirt::Util::Collection.find_matching(
             env[:libvirt_compute].servers.all, env[:domain_name])
+
+          @logger.info("Looking for domain #{env[:domain_name]}")
+
           if domain != nil
-            raise Vagrant::Errors::DomainNameExists,
+            raise ProviderLibvirt::Errors::DomainNameExists,
               :domain_name => env[:domain_name]
           end
 
diff --git a/lib/vagrant-libvirt/errors.rb b/lib/vagrant-libvirt/errors.rb
index e73e470..2d68e23 100644
--- a/lib/vagrant-libvirt/errors.rb
+++ b/lib/vagrant-libvirt/errors.rb
@@ -103,7 +103,7 @@ module VagrantPlugins
       end
 
       class DomainNameExists < VagrantLibvirtError
-        error_key(:domain_name_exists_error)
+        error_key(:domain_name_exists)
       end
 
       class NoDomainError < VagrantLibvirtError
diff --git a/locales/en.yml b/locales/en.yml
index e7ea0db..dd30dbd 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -89,7 +89,7 @@ en:
       fog_create_server_error: |-
         Error while creating domain: %{error_message}
       domain_name_exists: |-
-        Name of domain about to create is already taken. Please try to run
+        Name `%{domain_name}` of domain about to create is already taken. Please try to run
         `vagrant up` command again.
       creating_storage_pool_error: |-
         There was error while creating libvirt storage pool: %{error_message}

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