Merge branch '1.8'

This commit is contained in:
Takeshi KOMIYA 2019-02-01 22:35:52 +09:00
commit 98863e961a

View File

@ -136,8 +136,8 @@ 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