mirror of
https://github.com/sphinx-doc/sphinx.git
synced 2025-02-25 18:55:22 -06:00
Merge branch '1.8'
This commit is contained in:
commit
98863e961a
@ -136,11 +136,11 @@ class InventoryFile:
|
|||||||
if not m:
|
if not m:
|
||||||
continue
|
continue
|
||||||
name, type, prio, location, dispname = m.groups()
|
name, type, prio, location, dispname = m.groups()
|
||||||
if type == 'py:module' and type in invdata and \
|
if type == 'py:module' and type in invdata and name in invdata[type]:
|
||||||
name in invdata[type]: # due to a bug in 1.1 and below,
|
# due to a bug in 1.1 and below,
|
||||||
# two inventory entries are created
|
# two inventory entries are created
|
||||||
# for Python modules, and the first
|
# for Python modules, and the first
|
||||||
# one is correct
|
# one is correct
|
||||||
continue
|
continue
|
||||||
if location.endswith('$'):
|
if location.endswith('$'):
|
||||||
location = location[:-1] + name
|
location = location[:-1] + name
|
||||||
|
Loading…
Reference in New Issue
Block a user