gentoo-utils/gentoo-utils-gitea
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Packages Releases Activity

WIP: impl profile evaluation #7

Draft
jturnerusa wants to merge 10 commits from feature/profiles into master
pull from: feature/profiles
merge into: gentoo-utils:master
Conversation 2 Commits 10 Files Changed 49 +3 -3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7e61192fba - Show all commits

6
src/repo/profile/mod.rs
View File

@@ -64,7 +64,7 @@ pub enum Error {
pub struct Profile {
#[get(kind = "deref")]
path: PathBuf,
eapi: Option<Eapi>,
eapi: Eapi,
deprecated: Option<String>,
#[get(kind = "deref")]
parents: Vec<Profile>,
@@ -108,9 +108,9 @@ impl Profile {
let eapi = match fs::read_to_string(&eapi_path)
.map(|s| Eapi::parse(s.trim()).map_err(str::to_string))
{
Ok(Ok(eapi)) => Some(eapi),
Ok(Ok(eapi)) => eapi,
Ok(Err(rest)) => return Err(Error::Parser(rest)),
jturnerusa marked this conversation as resolved Outdated
penguin commented 2025-12-11 12:49:41 -06:00
Outdated
Review
Copy Link

I think the default behavior for no eapi file per the spec is to treat it as eapi 0. Do we do that here, or are we erroring out if there's no eapi file?

Maybe it should assign eapi 0 on failure to parse (no eapi file), then later during evaluation of the parsed profile you throw an error saying you don't support eapi 0. That way eapi 0 (or other versions) could be supported later without having to change parsing logic.

I think the default behavior for no eapi file per the spec is to treat it as eapi 0. Do we do that here, or are we erroring out if there's no eapi file? Maybe it should assign eapi 0 on failure to parse (no eapi file), then later during evaluation of the parsed profile you throw an error saying you don't support eapi 0. That way eapi 0 (or other versions) could be supported later without having to change parsing logic.
👍 1
Err(e) if matches!(e.kind(), io::ErrorKind::NotFound) => None,
Err(e) if matches!(e.kind(), io::ErrorKind::NotFound) => Eapi::parse("0").unwrap(),
Err(e) => return Err(Error::Io(eapi_path, e)),
};