From 466d00faff6e854a44a08677a8e9dcb0fc1d5a00 Mon Sep 17 00:00:00 2001 From: Risu <79110363+risu729@users.noreply.github.com> Date: Fri, 26 Sep 2025 05:44:43 +1000 Subject: [PATCH 1/2] fix(ubi): filter versions with tag_regex before trimming v prefixes --- src/backend/ubi.rs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/backend/ubi.rs b/src/backend/ubi.rs index dfb61cefaf..4e8065e564 100644 --- a/src/backend/ubi.rs +++ b/src/backend/ubi.rs @@ -85,20 +85,22 @@ impl Backend for UbiBackend { Ok(versions .into_iter() - // trim 'v' prefixes if they exist - .map(|t| match regex!(r"^v[0-9]").is_match(&t) { - true => t[1..].to_string(), - false => t, - }) - .sorted_by_cached_key(|v| !regex!(r"^[0-9]").is_match(v)) .filter(|v| { if let Some(re) = opts.get("tag_regex") { let re = tag_regex.get_or_init(|| Regex::new(re).unwrap()); - re.is_match(v) + let result = re.is_match(v); + debug!("filter {v} by tag_regex {re}: {result}"); + result } else { true } }) + // trim 'v' prefixes if they exist + .map(|t| match regex!(r"^v[0-9]").is_match(&t) { + true => t[1..].to_string(), + false => t, + }) + .sorted_by_cached_key(|v| !regex!(r"^[0-9]").is_match(v)) .rev() .collect()) } From 2bdf8f0181f7b00e773aea8cf8129b64c4260a98 Mon Sep 17 00:00:00 2001 From: Risu <79110363+risu729@users.noreply.github.com> Date: Fri, 26 Sep 2025 05:53:27 +1000 Subject: [PATCH 2/2] fix: remove debug code --- src/backend/ubi.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/backend/ubi.rs b/src/backend/ubi.rs index 4e8065e564..2fd488ad54 100644 --- a/src/backend/ubi.rs +++ b/src/backend/ubi.rs @@ -88,9 +88,7 @@ impl Backend for UbiBackend { .filter(|v| { if let Some(re) = opts.get("tag_regex") { let re = tag_regex.get_or_init(|| Regex::new(re).unwrap()); - let result = re.is_match(v); - debug!("filter {v} by tag_regex {re}: {result}"); - result + re.is_match(v) } else { true }