Intersphinx lookups: log inventory name at both load-time and ambiguous-resolution-time.

Author: jayaddison

sphinx/ext/intersphinx/_load.py

@@ -117,7 +117,9 @@ def fetch_inventory_group(
             # files; remote ones only if the cache time is expired
             if '://' not in inv or uri not in cache or cache[uri][1] < cache_time:
                 safe_inv_url = _get_safe_url(inv)
-                LOGGER.info(__('loading intersphinx inventory from %s...'), safe_inv_url)
+                inv_descriptor = name or 'main_inventory'
+                LOGGER.info(__("loading intersphinx inventory '%s' from %s..."),
+                            inv_descriptor, safe_inv_url)
                 try:
                     invdata = fetch_inventory(app, uri, inv)
                 except Exception as err:

sphinx/ext/intersphinx/_resolve.py

@@ -81,8 +81,9 @@ def _resolve_reference_in_domain_by_target(
             insensitive_matches = list(filter(lambda k: k.lower() == target_lower,
                                               inventory[objtype].keys()))
             if len(insensitive_matches) > 1:
-                LOGGER.warning(__("multiple matches found for %s:%s"),
-                               objtype, target,
+                inv_descriptor = inv_name or 'main_inventory'
+                LOGGER.warning(__("inventory '%s': multiple matches found for %s:%s"),
+                               inv_descriptor, objtype, target,
                                type='intersphinx',  subtype='external', location=node)
             if insensitive_matches:
                 data = inventory[objtype][insensitive_matches[0]]