before index-conflict changes

This commit is contained in:
pivodevat
2025-11-18 19:46:36 +03:00
parent 28ba2135ec
commit 30540602bd
66 changed files with 1403 additions and 879 deletions

View File

@ -1,4 +1,4 @@
use std::path::{Path, PathBuf};
use std::path::Path;
use std::fs;
use std::os::unix::fs::MetadataExt;
use glob::Pattern;
@ -42,7 +42,7 @@ pub fn trim_handler(repo: &String, trim_date: i64) {
let rules = crate::utils::parser::get_trim_rules(&cfg_path).unwrap();
let pkg_dir = PathBuf::from("/pkg").join(repo);
let pkg_dir = super::get_aeropkg_base().join(repo);
trim(repo, &pkg_dir, trim_date, &rules).unwrap();
}
@ -62,7 +62,7 @@ fn rules_check(repo: &String, path: &Path, rules: &String) -> bool {
let wildcard_string = if rule.starts_with('/') {
rule.to_string()
} else {
format!("/pkg/{}/{}", repo, rule)
super::get_aeropkg_base().join(repo).join(rule).to_string_lossy().into_owned()
};
let path_str = path.to_str().unwrap_or("");