[Pkg-ganeti-devel] [ganeti] 01/04: Fix FTBFS with sphinx 1.4

[Apollon Oikonomopoulos]

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

apoikos pushed a commit to branch master
in repository ganeti.

commit b9ce4c31cb1fccdeb8ad3720e92c93598229d34f
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Sat Jul 9 10:09:49 2016 +0200

    Fix FTBFS with sphinx 1.4
    
    Suppress sphinx's app.add_role warnings; upstream knowingly overrides
    sphinx's built-in manpage role, which leads to sphinx 1.4 issuing a
    warning, which is turned to error due to `-W'. Work around this by using
    sphinx's `suppress_warnings' confvar to ignore app.add_role warnings.
    Note that `suppress_warnings' is only effective in sphinx 1.4.2 and
    later, but I'm not bumping the B-D as setting it under 1.3.x should be
    harmless anyway.
    
    Also replace some unicode ellipses in doc/design-query2.rst with three
    plain ASCII dots, as sphinx also complains for failing to highlight
    these lines as Python code.
    
    Closes: #829186
---
 debian/patches/fix_ftbfs_with_sphinx_1.4 | 45 ++++++++++++++++++++++++++++++++
 debian/patches/series                    |  1 +
 2 files changed, 46 insertions(+)

diff --git a/debian/patches/fix_ftbfs_with_sphinx_1.4 b/debian/patches/fix_ftbfs_with_sphinx_1.4
new file mode 100644
index 0000000..6398577
--- /dev/null
+++ b/debian/patches/fix_ftbfs_with_sphinx_1.4
@@ -0,0 +1,45 @@
+Author: Apollon Oikonomopoulos <apoikos at debian.org>
+Description: Fix FTBFS with sphinx 1.4
+ Suppress app.add_role warnings, as upstream knowingly overrides sphinx's
+ built-in manpage role. Without this, a warning is emitted which then turns to
+ an error when sphinx is run with the `-W' switch.
+ .
+ Also replace unicode ellipses in doc/design-query2.rst with three ascii dots,
+ as sphinx emits another warning for not being able to properly highlight these
+ lines as Python code.
+Last-Update: 2016-07-09
+Forwarded: no
+--- a/doc/conf.py
++++ b/doc/conf.py
+@@ -229,3 +229,8 @@
+ 
+ # If false, no module index is generated.
+ latex_use_modindex = False
++
++# We override the manpage role and sphinx issues a warning, which is treated as
++# error. Suppress role_add warnings to avoid FTBFS.
++
++suppress_warnings = ["app.add_role"]
+--- a/doc/design-query2.rst
++++ b/doc/design-query2.rst
+@@ -129,16 +129,16 @@
+   specific names, the filter must be specified as follows, with the
+   inner part repeated for each name::
+ 
+-    ["|", ["=", "name", "node1"], ["=", "name", "node2"], …]
++    ["|", ["=", "name", "node1"], ["=", "name", "node2"], ...]
+ 
+-  Filters consist of S-expressions (``["operator", <operants…>]``) and
++  Filters consist of S-expressions (``["operator", <operants...>]``) and
+   extensions will be made in the future to allow for more operators and
+   fields. Such extensions might include a Python-style "in" operator,
+   but for simplicity only "=" is supported in this implementation.
+ 
+   To reiterate: Filters for this implementation must consist of exactly
+-  one OR expression (``["|", …]``) and one or more name equality filters
+-  (``["=", "name", "…"]``).
++  one OR expression (``["|", ...]``) and one or more name equality filters
++  (``["=", "name", "..."]``).
+ 
+ Support for synchronous queries, currently available in the interface
+ but disabled in the master daemon, will be dropped. Direct calls to
diff --git a/debian/patches/series b/debian/patches/series
index 0fedaa1..406f330 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ relax-deps
 ghc-7.10-compatibility.patch
 zlib-0.6-compatibility
 fix_FTBFS_with_sphinx-1.3.5
+fix_ftbfs_with_sphinx_1.4

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git