From: Vladimír Vondruš <mosra@centrum.cz>
Date: Fri, 30 Aug 2019 18:36:10 +0000 (+0200)
Subject: m.sphinx: ignore duplicate entries in intersphinx inventories.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=commitdiff_plain;h=cf916bc2947978f0062660eef13e51dce5c018e5;p=blog.git

m.sphinx: ignore duplicate entries in intersphinx inventories.

The "index" is the main offender.
---

diff --git a/plugins/m/sphinx.py b/plugins/m/sphinx.py
index cc10d721..0354b773 100755
--- a/plugins/m/sphinx.py
+++ b/plugins/m/sphinx.py
@@ -518,7 +518,9 @@ def merge_inventories(name_map, **kwargs):
     for type_, data_internal in internal_inventory.items():
         data = intersphinx_inventory.setdefault(type_, {})
         for path, value in data_internal.items():
-            assert path not in data
+            # Ignore duplicate things (such as `index` etc.)
+            # TODO: solve better
+            if path in data: continue
             data[path] = value
 
     # Save the internal inventory, if requested. Again basically a copy of