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

fix dependency/dependent id issue (#1546)

Browse Source
This commit is contained in:
Aiden McClelland
2022-06-16 13:14:05 -06:00
committed by GitHub
parent cc5e60ed90
commit 59eee33767
1 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
backend/src/config/mod.rs
View File

@@ -14,21 +14,18 @@ use serde_json::Value;
use tracing::instrument; use tracing::instrument;
use crate::context::RpcContext; use crate::context::RpcContext;
use crate::db::model::{CurrentDependencies, CurrentDependents}; use crate::db::model::{CurrentDependencies, CurrentDependencyInfo, CurrentDependents};
use crate::db::util::WithRevision;
use crate::dependencies::{ use crate::dependencies::{
add_dependent_to_current_dependents_lists, break_transitive, heal_all_dependents_transitive, add_dependent_to_current_dependents_lists, break_transitive, heal_all_dependents_transitive,
BreakageRes, DependencyConfig, DependencyError, DependencyErrors, TaggedDependencyError, BreakTransitiveReceipts, BreakageRes, Dependencies, DependencyConfig, DependencyError,
DependencyErrors, DependencyReceipt, TaggedDependencyError, TryHealReceipts,
}; };
use crate::install::cleanup::{remove_from_current_dependents_lists, UpdateDependencyReceipts};
use crate::s9pk::manifest::{Manifest, PackageId}; use crate::s9pk::manifest::{Manifest, PackageId};
use crate::util::display_none;
use crate::util::serde::{display_serializable, parse_stdin_deserializable, IoFormat}; use crate::util::serde::{display_serializable, parse_stdin_deserializable, IoFormat};
use crate::Error; use crate::Error;
use crate::{db::model::CurrentDependencyInfo, dependencies::DependencyReceipt};
use crate::{db::util::WithRevision, dependencies::Dependencies};
use crate::{
dependencies::BreakTransitiveReceipts,
install::cleanup::{remove_from_current_dependents_lists, UpdateDependencyReceipts},
};
use crate::{dependencies::TryHealReceipts, util::display_none};
pub mod action; pub mod action;
pub mod spec; pub mod spec;
@@ -37,11 +34,8 @@ pub mod util;
pub use spec::{ConfigSpec, Defaultable}; pub use spec::{ConfigSpec, Defaultable};
use util::NumRange; use util::NumRange;
use self::spec::{PackagePointerSpec, ValueSpecPointer}; use self::action::{ConfigActions, ConfigRes};
use self::{ use self::spec::{ConfigPointerReceipts, PackagePointerSpec, ValueSpecPointer};
action::{ConfigActions, ConfigRes},
spec::ConfigPointerReceipts,
};
pub type Config = serde_json::Map<String, Value>; pub type Config = serde_json::Map<String, Value>;
pub trait TypeOf { pub trait TypeOf {
@@ -697,7 +691,7 @@ pub fn configure_rec<'a, Db: DbHandle>(
dependent, dependent,
&manifest.version, &manifest.version,
&manifest.volumes, &manifest.volumes,
dependent, id,
&config, &config,
) )
.await? .await?