Merge branch 'master' into isbm-func-static

tinythings · Oct 30, 2024 · f38f8f7 · f38f8f7
2 parents 033fc6c + babe2f1
commit f38f8f7
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/libsysinspect/src/intp/actproc/modfinder.rs b/libsysinspect/src/intp/actproc/modfinder.rs
@@ -118,13 +118,18 @@ impl ModCall {
         }
 
         for exp in exp {
-            let fact = functions::get_by_namespace(resp.data(), &exp.get_fact_namespace());
-            let res = exp.eval(fact.to_owned());
-            if !res.is_positive() {
-                let mut traces: Vec<String> =
-                    vec![format!("{} fails with {}", &exp.get_fact_namespace(), dataconv::to_string(fact).unwrap_or_default())];
-                traces.extend(res.traces().to_owned());
-                return (Some(false), Some(traces));
+            let fact = Expression::get_by_namespace(resp.data(), &exp.get_fact_namespace());
+            if !exp.eval(fact.to_owned()) {
+                let fact = dataconv::to_string(fact).unwrap_or_default();
+                return (
+                    Some(false),
+                    Some(format!(
+                        "{} fact {}{}",
+                        &exp.get_fact_namespace(),
+                        if fact.is_empty() { "data was not found" } else { "fails as " },
+                        fact
+                    )),
+                );
             }
         }