[DRE-commits] [ruby-multi-xml] 08/12: Fix tests for ruby-ox >= 2.4.13 (Closes: #882718)
Cédric Boutillier
boutil at moszumanska.debian.org
Mon Dec 4 23:45:29 UTC 2017
This is an automated email from the git hooks/post-receive script.
boutil pushed a commit to branch master
in repository ruby-multi-xml.
commit 444a6d75aefd93a797a29b3bd1767007fe247b48
Author: Cédric Boutillier <boutil at debian.org>
Date: Tue Dec 5 00:23:53 2017 +0100
Fix tests for ruby-ox >= 2.4.13 (Closes: #882718)
---
debian/patches/ox_spaces.patch | 24 ++++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 25 insertions(+)
diff --git a/debian/patches/ox_spaces.patch b/debian/patches/ox_spaces.patch
new file mode 100644
index 0000000..9f510f0
--- /dev/null
+++ b/debian/patches/ox_spaces.patch
@@ -0,0 +1,24 @@
+Description: Update for ox > 2.4.11
+Author: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri at civ.zcu.cz>
+Date: Thu, 18 May 2017 23:10:48 +0200
+Origin: https://github.com/sferik/multi_xml/commit/f9d18d87c3340aa53f524524bf189b99459ab1e6.patch
+Bug: https://github.com/sferik/multi_xml/issues/62
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=882718
+Reviewed-by: Cédric Boutillier <boutil at debian.org>
+
+There is more pedantic parsing of white-space characters in ox > 2.4.11. Better to set explicitly the expected skip mode.
+---
+ lib/multi_xml/parsers/ox.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/lib/multi_xml/parsers/ox.rb
++++ b/lib/multi_xml/parsers/ox.rb
+@@ -29,7 +29,7 @@
+
+ def parse(io)
+ handler = Handler.new
+- ::Ox.sax_parse(handler, io, :convert_special => true)
++ ::Ox.sax_parse(handler, io, :convert_special => true, :skip => :skip_return)
+ handler.doc
+ end
+
diff --git a/debian/patches/series b/debian/patches/series
index 93f0321..75fbf9c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
remove-simplecov.patch
+ox_spaces.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-multi-xml.git
More information about the Pkg-ruby-extras-commits
mailing list