Properly handle lddtree error

Updated lddtree to 0.2.6
PyO3 · Feb 4, 2022 · 85f853b · 85f853b
1 parent 0370091
commit 85f853b
Show file tree

Hide file tree

Showing 4 changed files with 38 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/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(|err| AuditWheelError::DependencyAnalysisError(err))?;
     let mut ext_libs = Vec::new();
     for (name, lib) in deps.libraries {
         // Skip dynamic linker/loader and white-listed libs