Don't add duplicate files

Add a file tracker for writing archives that checks that each path in the archive can't be added more than once. If the same file would be added twice, it's ignored the second time, if a different file would be added, it errors. Fixes #2066 Fixes #2106
PyO3 · Jun 27, 2024 · f34e4ab · f34e4ab
1 parent 844a2d6
commit f34e4ab
Show file tree

Hide file tree

Showing 9 changed files with 170 additions and 38 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -82,6 +82,7 @@ normpath = "1.1.1"
 path-slash = "0.2.1"
 pep440_rs = { version = "0.5.0", features = ["serde", "tracing"] }
 pep508_rs = { version = "0.4.2", features = ["serde", "tracing"] }
+same-file = "1.0.6"
 time = "0.3.17"
 url = "2.5.0"
 unicode-xid = { version = "0.2.4", optional = true }

diff --git a/Changelog.md b/Changelog.md
@@ -2,6 +2,8 @@
 
 ## [Unreleased]
 
+* Don't add files to an archive more than once [#2125](https://github.com/PyO3/maturin/issues/2125)
+
 ## [1.6.0] - 2024-06-04
 
 * Detect compiling from Linux gnu to Linux musl as cross compiling in [#2010](https://github.com/PyO3/maturin/pull/2010)