Query both relative and absolute path in module duplication check

bonprosoft · bonprosoft · commit c1f7d1e4c458 · 2020-07-04T16:03:40.000+09:00
diff --git a/mypy/build.py b/mypy/build.py
@@ -2754,7 +2754,7 @@ def load_graph(sources: List[BuildSource], manager: BuildManager,
 
     # Note: Running this each time could be slow in the daemon. If it's a problem, we
     # can do more work to maintain this incrementally.
-    seen_files = {os.path.abspath(st.path): st for st in graph.values() if st.path}
+    seen_files = {st.path: st for st in graph.values() if st.path}
 
     # Collect dependencies.  We go breadth-first.
     # More nodes might get added to new as we go, but that's fine.
@@ -2802,17 +2802,26 @@ def load_graph(sources: List[BuildSource], manager: BuildManager,
                         st.suppress_dependency(dep)
                 else:
                     if newst.path:
-                        newst_path = os.path.abspath(newst.path)
+                        newst_path = newst.path
+                        seen_state = seen_files.get(newst_path)
 
-                        if newst_path in seen_files:
+                        if seen_state is None:
+                            if os.path.isabs(newst_path):
+                                newst_path = os.path.relpath(newst_path)
+                            else:
+                                newst_path = os.path.abspath(newst_path)
+
+                            seen_state = seen_files.get(newst_path)
+
+                        if seen_state is not None:
                             manager.errors.report(
                                 -1, 0,
                                 "Source file found twice under different module names: "
-                                "'{}' and '{}'".format(seen_files[newst_path].id, newst.id),
+                                "'{}' and '{}'".format(seen_state.id, newst.id),
                                 blocker=True)
                             manager.errors.raise_error()
 
-                        seen_files[newst_path] = newst
+                        seen_files[newst.path] = newst
 
                     assert newst.id not in graph, newst.id
                     graph[newst.id] = newst
