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 lock held on different handle

Browse Source
This commit is contained in:
Aiden McClelland
2021-09-24 11:44:13 -06:00
committed by Aiden McClelland
parent 8a2622c05f
commit 9b6bae7e94
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -277,16 +277,8 @@ pub async fn install_s9pk<R: AsyncRead + AsyncSeek + Unpin>(
rdr.validated(); rdr.validated();
let model = crate::db::DatabaseModel::new() let model = crate::db::DatabaseModel::new()
.package_data() .package_data()
.idx_model(pkg_id) .idx_model(pkg_id);
.check(&mut ctx.db.handle()) let progress_model = model.clone().and_then(|m| m.install_progress());
.await?
.ok_or_else(|| {
Error::new(
anyhow!("PackageDataEntry does not exist"),
crate::ErrorKind::Database,
)
})?;
let progress_model = model.clone().install_progress();
log::info!("Install {}@{}: Unpacking Manifest", pkg_id, version); log::info!("Install {}@{}: Unpacking Manifest", pkg_id, version);
let manifest = progress let manifest = progress
@@ -589,7 +581,7 @@ pub async fn install_s9pk<R: AsyncRead + AsyncSeek + Unpin>(
current_dependencies, current_dependencies,
interface_addresses, interface_addresses,
}; };
let mut pde = model.get_mut(&mut tx).await?; let mut pde = model.expect(&mut tx).await?.get_mut(&mut tx).await?;
let prev = std::mem::replace( let prev = std::mem::replace(
&mut *pde, &mut *pde,
PackageDataEntry::Installed { PackageDataEntry::Installed {