misc fixes

This commit is contained in:
Aiden McClelland
2021-09-01 16:14:31 -06:00
committed by Aiden McClelland
parent 4de560c342
commit 824bccda0e
5 changed files with 12 additions and 8 deletions

View File

@@ -304,6 +304,7 @@ pub async fn download_install_s9pk(
let mut tx = handle.begin().await?;
if let Err(e) = cleanup_failed(&ctx, &mut tx, pkg_id, version).await {
let mut tx = handle.begin().await?;
log::error!(
"Failed to clean up {}@{}: {}: Adding to broken packages",
pkg_id,
@@ -312,10 +313,13 @@ pub async fn download_install_s9pk(
);
let mut broken = crate::db::DatabaseModel::new()
.broken_packages()
.get_mut(&mut handle)
.get_mut(&mut tx)
.await?;
broken.push(pkg_id.clone());
broken.save(&mut handle).await?;
broken.save(&mut tx).await?;
tx.commit(None).await?;
} else {
tx.commit(None).await?;
}
Err(e)
} else {