[DRE-commits] [vagrant-libvirt] 83/163: Check for absolute disk path in #validate

Antonio Terceiro terceiro at moszumanska.debian.org
Sun Apr 24 13:57:08 UTC 2016


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

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

commit f39797fa6adf957fa452be36d52cf1dbb4ca7378
Author: Brian Pitts <brian at polibyte.com>
Date:   Mon Nov 17 21:35:38 2014 -0600

    Check for absolute disk path in #validate
---
 lib/vagrant-libvirt/action/create_domain.rb |  5 -----
 lib/vagrant-libvirt/config.rb               | 10 ++++++++++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/vagrant-libvirt/action/create_domain.rb b/lib/vagrant-libvirt/action/create_domain.rb
index 0a7d2ef..a49e4fe 100644
--- a/lib/vagrant-libvirt/action/create_domain.rb
+++ b/lib/vagrant-libvirt/action/create_domain.rb
@@ -66,11 +66,6 @@ module VagrantPlugins
           storage_prefix = File.dirname(@domain_volume_path)+'/'	# steal
 
           @disks.each do |disk|
-            if disk[:path] and disk[:path][0] == '/'
-              raise Errors::FogCreateVolumeError,
-                :error_message =>
-                  "absolute volume path '#{disk[:path]}' not yet supported"
-            end
 
             disk[:path] ||= _disk_name(@name, disk)
 
diff --git a/lib/vagrant-libvirt/config.rb b/lib/vagrant-libvirt/config.rb
index 3186309..12e049e 100644
--- a/lib/vagrant-libvirt/config.rb
+++ b/lib/vagrant-libvirt/config.rb
@@ -243,7 +243,17 @@ module VagrantPlugins
       end
 
       def validate(machine)
+        errors = _detected_errors
+
+        machine.provider_config.disks.each do |disk|
+          if disk[:path] and disk[:path][0] == '/'
+            errors << "absolute volume paths like '#{disk[:path]}' not yet supported"
+          end
+        end
+
+         { "Libvirt Provider" => errors }
       end
+
     end
   end
 end

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



More information about the Pkg-ruby-extras-commits mailing list