chiark
/
gitweb
/
~cjwatson
/
blog.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5e63b39
)
m.sphinx: ignore duplicate entries in intersphinx inventories.
author
Vladimír Vondruš
<mosra@centrum.cz>
Fri, 30 Aug 2019 18:36:10 +0000
(20:36 +0200)
committer
Vladimír Vondruš
<mosra@centrum.cz>
Fri, 30 Aug 2019 18:37:46 +0000
(20:37 +0200)
The "index" is the main offender.
plugins/m/sphinx.py
patch
|
blob
|
history
diff --git
a/plugins/m/sphinx.py
b/plugins/m/sphinx.py
index cc10d7211cf7b98c79dc6effb7f82d5cb136b07d..0354b773c640747548d0c745d790c44e18f7628d 100755
(executable)
--- 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