[Python-modules-commits] [sphinx] 01/01: Backport upstream patch to fix wrong AssertionError in C++ domain.

[Dmitry Shachnev]

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

mitya57 pushed a commit to branch debian/master
in repository sphinx.

commit 910cf450f110fb6eb0ceb4e8f27bfe9376ec28a6
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Oct 4 11:12:11 2017 +0700

    Backport upstream patch to fix wrong AssertionError in C++ domain.
    
    Closes: #877014.
---
 debian/changelog                  |  2 ++
 debian/patches/cpp_no_assert.diff | 25 +++++++++++++++++++++++++
 debian/patches/series             |  1 +
 3 files changed, 28 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6c7d085..dd67c27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ sphinx (1.6.4-2) UNRELEASED; urgency=medium
 
   * Add a note that dh_sphinxdoc does not actually build the documentation
     to its manpage.
+  * Backport upstream patch to fix wrong AssertionError in C++ domain
+    (cpp_no_assert.diff; closes: #877014).
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Thu, 28 Sep 2017 19:44:01 +0300
 
diff --git a/debian/patches/cpp_no_assert.diff b/debian/patches/cpp_no_assert.diff
new file mode 100644
index 0000000..2a9b420
--- /dev/null
+++ b/debian/patches/cpp_no_assert.diff
@@ -0,0 +1,25 @@
+From: Dmitry Shachnev <mitya57 at debian.org>
+Date: Thu, 28 Sep 2017 21:48:22 +0300
+Subject: C++: Do not assert False if type and declType mismatch
+
+Revert to 1.6.4 behavior where a warning was raised instead.
+(cherry picked from commit b01de08e19c918fddd8645c431c071725a623042)
+---
+ sphinx/domains/cpp.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py
+index f8a77ce..f55018b 100644
+--- a/sphinx/domains/cpp.py
++++ b/sphinx/domains/cpp.py
+@@ -4963,8 +4963,8 @@ class CPPDomain(Domain):
+             if declTyp == 'templateParam':
+                 return True
+             objtypes = self.objtypes_for_role(typ)
+-            if objtypes and declTyp in objtypes:
+-                return True
++            if objtypes:
++                return declTyp in objtypes
+             print("Type is %s, declType is %s" % (typ, declTyp))
+             assert False
+         if not checkType():
diff --git a/debian/patches/series b/debian/patches/series
index 609a68b..6713f7e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ disable_js_version_check.diff
 no_snowballstemmer.diff
 skip_tests_network.diff
 no_require_websupport.diff
+cpp_no_assert.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/sphinx.git