NuKVM/vagrant-libvirt
3
0
Fork 0
mirror of https://github.com/vagrant-libvirt/vagrant-libvirt.git synced 2024-07-07 04:22:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use compare-xml instead of equivalent-xml (#1565)

Browse Source 
`equivalent-xml` is pretty much dead upstream, `compare-xml` on the
other hand has some upstream activity
This commit is contained in:
Dan Čermák 2022-08-29 15:44:02 +02:00 committed by GitHub
parent fc5598ddb8
commit 64910dbd90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/vagrant-libvirt/action/start_domain.rb
View File

@ -2,7 +2,7 @@
require 'log4r'
require 'equivalent-xml'
require 'compare-xml'
require 'rexml/document'
module VagrantPlugins
@ -437,7 +437,7 @@ module VagrantPlugins
proposed = Nokogiri::XML(new_xml, &:noblanks)
applied = Nokogiri::XML(applied_xml, &:noblanks)
if !EquivalentXml.equivalent?(proposed, applied)
if CompareXML.equivalent?(proposed, applied, { force_children: true })
require 'diffy'
# pretty print the XML as even though there can be additional changes,

2
vagrant-libvirt.gemspec
View File

@ -23,7 +23,7 @@ Gem::Specification.new do |s|
s.add_runtime_dependency 'fog-libvirt', '>= 0.6.0'
s.add_runtime_dependency 'fog-core', '~> 2'
s.add_runtime_dependency 'rexml'
s.add_runtime_dependency 'equivalent-xml'
s.add_runtime_dependency 'compare-xml'
s.add_runtime_dependency 'diffy'
# Make sure to allow use of the same version as Vagrant by being less specific