2 Commits

Author SHA1 Message Date
82b292263c add profile related source files to sources variable
All checks were successful
Gentoo Utils / build-oci-image (pull_request) Successful in 8s
Gentoo Utils / build (pull_request) Successful in 35s
2025-12-09 22:15:08 +00:00
b41593eb0b impl profile evaluation
All checks were successful
Gentoo Utils / build-oci-image (pull_request) Successful in 11s
Gentoo Utils / build (pull_request) Successful in 40s
2025-12-09 21:50:30 +00:00
2 changed files with 2 additions and 16 deletions

View File

@@ -2,4 +2,4 @@
ninja rustfmt -C build
ninja rustdoc -C build
ninja clippy -C build
meson test -v -C build
meson test -C build

View File

@@ -8,7 +8,7 @@ use std::{
use get::Get;
use itertools::Itertools;
use crate::{Parseable, atom::Atom, repo::ebuild::Eapi, useflag::UseFlag};
use crate::{atom::Atom, useflag::UseFlag};
mod make_defaults;
mod package;
@@ -43,15 +43,12 @@ pub enum Error {
PackageUse(#[from] package_use::Error),
#[error("error evaluating use settings: {0}")]
Use(#[from] useflags::Error),
#[error("parser error: {0}")]
Parser(String),
}
#[derive(Debug, Clone, Get)]
pub struct Profile {
#[get(kind = "deref")]
path: PathBuf,
eapi: Option<Eapi>,
#[get(kind = "deref")]
parents: Vec<Profile>,
make_defaults: HashMap<String, String>,
@@ -90,16 +87,6 @@ impl Profile {
Err(e) => return Err(Error::Io(parents_path, e)),
};
let eapi_path = path.as_ref().join("eapi");
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(Err(rest)) => return Err(Error::Parser(rest)),
Err(e) if matches!(e.kind(), io::ErrorKind::NotFound) => None,
Err(e) => return Err(Error::Io(eapi_path, e)),
};
let make_defaults = make_defaults::evaluate(&parents, &path)?;
let packages = packages::evaluate(&parents, &path)?;
@@ -123,7 +110,6 @@ impl Profile {
Ok(Self {
path: path.as_ref().to_path_buf(),
parents,
eapi,
make_defaults,
packages,
package_mask,