Merge pull request #794 from messense/update-lddtree

Properly handle lddtree error
PyO3 · Feb 4, 2022 · 1f84465 · 1f84465
2 parents 3118069 + a5a364f
commit 1f84465
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 27 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -53,7 +53,7 @@ ignore = "0.4.18"
 dialoguer = "0.9.0"
 console = "0.15.0"
 minijinja = "0.13.0"
-lddtree = "0.2.5"
+lddtree = "0.2.6"
 cc = "1.0.72"
 clap = { version = "3.0.13", features = ["derive", "env", "wrap_help"] }
 clap_complete = "3.0.4"

diff --git a/Changelog.md b/Changelog.md
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Fix missing Python submodule in wheel in [#772](https://github.com/PyO3/maturin/pull/772)
 * Add support for specifying cargo manifest path in pyproject.toml in [#781](https://github.com/PyO3/maturin/pull/781)
 * Add support for passing arguments to pep517 command via `MATURIN_PEP517_ARGS` env var in [#786](https://github.com/PyO3/maturin/pull/786)
+* Fix auditwheel `No such file or directory` error when `LD_LIBRARY_PATH` contains non-existent paths in [#794](https://github.com/PyO3/maturin/pull/794)
 
 ## [0.12.6] - 2021-12-31
 

diff --git a/src/auditwheel/audit.rs b/src/auditwheel/audit.rs
@@ -51,6 +51,9 @@ pub enum AuditWheelError {
     /// This platform tag isn't defined by auditwheel yet
     #[error("{0} compatibility policy is not defined by auditwheel yet, pass `--skip-auditwheel` to proceed anyway")]
     UndefinedPolicy(String),
+    /// Failed to analyze external shared library dependencies of the wheel
+    #[error("Failed to analyze external shared library dependencies of the wheel")]
+    DependencyAnalysisError(#[source] lddtree::Error),
 }
 
 #[derive(Clone, Debug)]

diff --git a/src/auditwheel/repair.rs b/src/auditwheel/repair.rs
@@ -10,7 +10,9 @@ pub fn find_external_libs(
     sysroot: PathBuf,
 ) -> Result<Vec<lddtree::Library>, AuditWheelError> {
     let dep_analyzer = DependencyAnalyzer::new(sysroot);
-    let deps = dep_analyzer.analyze(artifact).unwrap();
+    let deps = dep_analyzer
+        .analyze(artifact)
+        .map_err(AuditWheelError::DependencyAnalysisError)?;
     let mut ext_libs = Vec::new();
     for (name, lib) in deps.libraries {
         // Skip dynamic linker/loader and white-listed libs