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

reorganize

Browse Source
This commit is contained in:
Aiden McClelland
2021-10-09 16:03:52 -06:00
committed by Aiden McClelland
parent b2fa955ad5
commit c2150efb69
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
appmgr/src/install/mod.rs
View File

@@ -628,13 +628,6 @@ pub async fn install_s9pk<R: AsyncRead + AsyncSeek + Unpin>(
*dep_errs = DependencyErrors::init(ctx, &mut tx, &manifest, &current_dependencies).await?; *dep_errs = DependencyErrors::init(ctx, &mut tx, &manifest, &current_dependencies).await?;
dep_errs.save(&mut tx).await?; dep_errs.save(&mut tx).await?;
let recovered = crate::db::DatabaseModel::new()
.recovered_packages()
.idx_model(pkg_id)
.get(&mut tx, true)
.await?
.into_owned();
if let PackageDataEntry::Updating { if let PackageDataEntry::Updating {
installed: prev, installed: prev,
manifest: prev_manifest, manifest: prev_manifest,
@@ -710,6 +703,12 @@ pub async fn install_s9pk<R: AsyncRead + AsyncSeek + Unpin>(
} }
} else { } else {
update_dependents(ctx, &mut tx, pkg_id, current_dependents.keys()).await?; update_dependents(ctx, &mut tx, pkg_id, current_dependents.keys()).await?;
let recovered = crate::db::DatabaseModel::new()
.recovered_packages()
.idx_model(pkg_id)
.get(&mut tx, true)
.await?
.into_owned();
if let Some(recovered) = recovered { if let Some(recovered) = recovered {
let configured = if let Some(res) = manifest let configured = if let Some(res) = manifest
.migrations .migrations