From c2150efb698e0f472502fe490e08ebe8971c7174 Mon Sep 17 00:00:00 2001 From: Aiden McClelland Date: Sat, 9 Oct 2021 16:03:52 -0600 Subject: [PATCH] reorganize --- appmgr/src/install/mod.rs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/appmgr/src/install/mod.rs b/appmgr/src/install/mod.rs index 36202fbce..9d7786eaf 100644 --- a/appmgr/src/install/mod.rs +++ b/appmgr/src/install/mod.rs @@ -628,13 +628,6 @@ pub async fn install_s9pk( *dep_errs = DependencyErrors::init(ctx, &mut tx, &manifest, ¤t_dependencies).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 { installed: prev, manifest: prev_manifest, @@ -710,6 +703,12 @@ pub async fn install_s9pk( } } else { 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 { let configured = if let Some(res) = manifest .migrations