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

[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 adaf055856ed612910310e1c3eaf9ff0680d893d
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Tue Jul 25 16:56:02 2017 +0300

    Fix FTBFS with sphinx 1.5
    
    Closes: #868601
---
 debian/patches/fix-ftbfs-with-sphinx-1.5.patch | 56 ++++++++++++++++++++++++++
 debian/patches/series                          |  1 +
 2 files changed, 57 insertions(+)

diff --git a/debian/patches/fix-ftbfs-with-sphinx-1.5.patch b/debian/patches/fix-ftbfs-with-sphinx-1.5.patch
new file mode 100644
index 0000000..46bc39b
--- /dev/null
+++ b/debian/patches/fix-ftbfs-with-sphinx-1.5.patch
@@ -0,0 +1,56 @@
+Author: Apollon Oikonomopoulos <apoikos at debian.org>
+Description: Fix FTBFS with sphinx 1.5
+ Sphinx 1.5 populates the docutils rst parser roles during application setup
+ time, rather than during import time (as was done previously). Make sure we
+ don't expect the roles to be available before we configure sphinx ourselves.
+ .
+ Also, latex_use_modindex is deprecated and has been superseded by
+ latex_domain_indices.
+Bug-Debian: https://bugs.debian.org/868601
+Forwarded: no
+Last-Update: 2017-07-25
+--- a/lib/build/sphinx_ext.py
++++ b/lib/build/sphinx_ext.py
+@@ -50,13 +50,7 @@
+ 
+ s_compat = sphinx.util.compat
+ 
+-try:
+-  # Access to a protected member of a client class
+-  # pylint: disable=W0212
+-  orig_manpage_role = docutils.parsers.rst.roles._roles["manpage"]
+-except (AttributeError, ValueError, KeyError), err:
+-  # Normally the "manpage" role is registered by sphinx/roles.py
+-  raise Exception("Can't find reST role named 'manpage': %s" % err)
++orig_manpage_role = None
+ 
+ from ganeti import _constants
+ from ganeti import constants
+@@ -637,6 +631,16 @@
+   """Sphinx extension callback.
+ 
+   """
++  global orig_manpage_role
++
++  try:
++    # Access to a protected member of a client class
++    # pylint: disable=W0212
++    orig_manpage_role = docutils.parsers.rst.roles._roles["manpage"]
++  except (AttributeError, ValueError, KeyError), err:
++    # Normally the "manpage" role is registered by sphinx/roles.py
++    raise Exception("Can't find reST role named 'manpage': %s" % err)
++
+   # TODO: Implement Sphinx directive for query fields
+   app.add_directive("opcode_params", OpcodeParams)
+   app.add_directive("opcode_result", OpcodeResult)
+--- a/doc/conf.py
++++ b/doc/conf.py
+@@ -228,7 +228,7 @@
+ #latex_appendices = []
+ 
+ # If false, no module index is generated.
+-latex_use_modindex = False
++latex_domain_indices = False
+ 
+ # We override the manpage role and sphinx issues a warning, which is treated as
+ # error. Suppress role_add warnings to avoid FTBFS.
diff --git a/debian/patches/series b/debian/patches/series
index f2bf4cb..97830fd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@ fix-ssh-key-renewal-on-single-node-clusters.patch
 set-defaults-for-ssh-type-bits.patch
 use-hv-class-to-check-for-migration.patch
 do-not-specify-socat-ssl-method.patch
+fix-ftbfs-with-sphinx-1.5.patch

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