Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-30 12:11:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

switch to managers: wip

Browse Source
This commit is contained in:
Aiden McClelland
2021-07-13 16:55:05 -06:00
committed by Aiden McClelland
parent e2b77b23f8
commit 34e4c12af3
26 changed files with 783 additions and 803 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
appmgr/src/dependencies.rs
View File

@@ -8,7 +8,6 @@ use serde::{Deserialize, Serialize};
use crate::action::ActionImplementation;
use crate::config::{Config, ConfigSpec};
use crate::net::host::Hosts;
use crate::net::interface::InterfaceId;
use crate::s9pk::manifest::PackageId;
use crate::status::health_check::{HealthCheckId, HealthCheckResult, HealthCheckResultVariant};
@@ -137,38 +136,31 @@ impl DepInfo {
dependent_id: &PackageId,
dependent_version: &Version,
) -> Result<Result<(), DependencyError>, Error> {
let dependency = crate::db::DatabaseModel::new()
let (manifest, info) = if let Some(dep_model) = crate::db::DatabaseModel::new()
.package_data()
.idx_model(dependency_id)
.and_then(|pde| pde.installed())
.get(db)
.await?;
let info = if let Some(info) = &*dependency {
info
.check(db)
.await?
{
(
dep_model.clone().manifest().get(db).await?,
dep_model.get(db).await?,
)
} else {
return Ok(Err(DependencyError::NotInstalled));
};
if !&info.manifest.version.satisfies(&self.version) {
if !&manifest.version.satisfies(&self.version) {
return Ok(Err(DependencyError::IncorrectVersion {
expected: self.version.clone(),
received: info.manifest.version.clone(),
received: manifest.version.clone(),
}));
}
let hosts = crate::db::DatabaseModel::new()
.network()
.hosts()
.get(db)
.await?;
let dependency_config = if let Some(cfg) = dependency_config {
cfg
} else if let Some(cfg_info) = &info.manifest.config {
} else if let Some(cfg_info) = &manifest.config {
cfg_info
.get(
dependency_id,
&info.manifest.version,
&info.manifest.volumes,
&hosts,
)
.get(dependency_id, &manifest.version, &manifest.volumes)
.await?
.config
.unwrap_or_default()