Skip to content

Commit

Permalink
Use compare-xml instead of equivalent-xml (vagrant-libvirt#1565)
Browse files Browse the repository at this point in the history
`equivalent-xml` is pretty much dead upstream, `compare-xml` on the
other hand has some upstream activity
  • Loading branch information
dcermak authored and mmguero committed Aug 29, 2022
1 parent d7de5e4 commit 826d9b1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions lib/vagrant-libvirt/action/start_domain.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

require 'log4r'

require 'equivalent-xml'
require 'compare-xml'
require 'rexml/document'

module VagrantPlugins
Expand Down Expand Up @@ -437,7 +437,7 @@ def call(env)
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,
Expand Down
2 changes: 1 addition & 1 deletion vagrant-libvirt.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 826d9b1

Please sign in to comment.