Consider duplicate packages

Author: konstin

crates/uv-installer/src/installed_packages.rs

@@ -152,75 +152,76 @@ impl InstalledPackages {
         path: &Path,
         dist_info: &InstalledDist,
     ) -> bool {
-        // In most cases, there is no other distribution of the same name in path.
-        let Some(existing) = by_name
-            .get(dist_info.name())
-            .into_iter()
-            .flatten()
-            .find_map(|dist_id| distributions[*dist_id].as_ref())
-        else {
+        let Some(existing_ids) = by_name.get(dist_info.name()) else {
             return false;
         };
+        // In most cases, there is no other distribution of the same name in path.
+        for existing_id in existing_ids {
+            let Some(existing) = distributions[*existing_id].as_ref() else {
+                continue;
+            };
 
-        // Ignore duplicate paths in `sys.path`
-        if existing == dist_info {
-            return true;
-        }
+            // Ignore duplicate paths in `sys.path`
+            if existing == dist_info {
+                return true;
+            }
 
-        // On fedora, purelib and platlib in a venv are `.venv/lib` and `.venv/lib64`,
-        // with `.venv/lib64` being a symlink to `.venv/lib`. We have to deduplicate
-        // access across this symlink, such as:
-        // * `.venv/lib/python3.13/site-packages/foo-1.0.0.dist-info`
-        // * `.venv/lib64/python3.13/site-packages/foo-1.0.0.dist-info`
-        if is_same_file(existing.path(), dist_info.path()).unwrap_or(false) {
-            return true;
-        }
+            // On fedora, purelib and platlib in a venv are `.venv/lib` and `.venv/lib64`,
+            // with `.venv/lib64` being a symlink to `.venv/lib`. We have to deduplicate
+            // access across this symlink, such as:
+            // * `.venv/lib/python3.13/site-packages/foo-1.0.0.dist-info`
+            // * `.venv/lib64/python3.13/site-packages/foo-1.0.0.dist-info`
+            if is_same_file(existing.path(), dist_info.path()).unwrap_or(false) {
+                return true;
+            }
 
-        // egg-info directories are special: We may see them twice, once as dist-info
-        // directory, and then again as egg-info directory in a subdirectory of the
-        // package of the same name, linked from the `sys.path` entry added by the
-        // editable. If they both point to the same path, we want to only consider the
-        // dist-info that already covers the package.
-        if let InstalledDist::EggInfoDirectory(InstalledEggInfoDirectory {
-            base_path: Some(base_path),
-            ..
-        }) = &dist_info
-        {
-            if let InstalledDist::Url(InstalledDirectUrlDist { url, .. }) = existing {
-                if !is_same_file(url.path(), base_path).unwrap_or(false) {
-                    debug!(
-                        "Ignoring already processed egg-info at: `{}`",
-                        path.user_display()
-                    );
-                    return true;
+            // egg-info directories are special: We may see them twice, once as dist-info
+            // directory, and then again as egg-info directory in a subdirectory of the
+            // package of the same name, linked from the `sys.path` entry added by the
+            // editable. If they both point to the same path, we want to only consider the
+            // dist-info that already covers the package.
+            if let InstalledDist::EggInfoDirectory(InstalledEggInfoDirectory {
+                base_path: Some(base_path),
+                ..
+            }) = &dist_info
+            {
+                if let InstalledDist::Url(InstalledDirectUrlDist { url, .. }) = existing {
+                    if !is_same_file(url.path(), base_path).unwrap_or(false) {
+                        debug!(
+                            "Ignoring already processed egg-info at: `{}`",
+                            path.user_display()
+                        );
+                        return true;
+                    }
                 }
             }
-        }
 
-        // It can be valid to shadow packages, but two different distributions for the
-        // same package name in the same directory should never happen, see e.g.
-        // https://github.com/astral-sh/uv/issues/11648. In this case, it is not clear
-        // of which version the module that Python will pick up is. We must keep both
-        // to remove both.
-        if !is_same_file(
-            existing.path().parent().unwrap_or(Path::new("")),
-            dist_info.path().parent().unwrap_or(Path::new("")),
-        )
-        .unwrap_or(false)
-        {
-            debug!(
-                "The package `{}` has multiple installed distributions:\n\
-                  - version {} at `{}`\n\
-                  - version {} at `{}`",
-                dist_info.name(),
-                existing.version(),
-                existing.path().user_display(),
-                dist_info.version(),
-                dist_info.path().user_display(),
-            );
+            // It can be valid to shadow packages, but two different distributions for the
+            // same package name in the same directory should never happen, see e.g.
+            // https://github.com/astral-sh/uv/issues/11648. In this case, it is not clear
+            // of which version the module that Python will pick up is. We must keep both
+            // to remove both.
+            if !is_same_file(
+                existing.path().parent().unwrap_or(Path::new("")),
+                dist_info.path().parent().unwrap_or(Path::new("")),
+            )
+            .unwrap_or(false)
+            {
+                debug!(
+                    "The package `{}` has multiple installed distributions:\n\
+                      - version {} at `{}`\n\
+                      - version {} at `{}`",
+                    dist_info.name(),
+                    existing.version(),
+                    existing.path().user_display(),
+                    dist_info.version(),
+                    dist_info.path().user_display(),
+                );
+                // We can't skip distributions even if they are inexact duplicates as we must
+                // uninstall them, so we continue to the `false` return.
+            }
         }
 
-        // We can't skip duplicate distributions as we must uninstall them
         false
     }