mirror of
https://github.com/Start9Labs/start-os.git
synced 2026-03-30 20:14:49 +00:00
removed broken packages entry in patchdb
This commit is contained in:
committed by
Aiden McClelland
parent
f6d67142cb
commit
8c1016b3eb
@@ -29,7 +29,6 @@ pub struct Database {
|
|||||||
pub package_data: AllPackageData,
|
pub package_data: AllPackageData,
|
||||||
#[model]
|
#[model]
|
||||||
pub recovered_packages: BTreeMap<PackageId, RecoveredPackageInfo>,
|
pub recovered_packages: BTreeMap<PackageId, RecoveredPackageInfo>,
|
||||||
pub broken_packages: Vec<PackageId>,
|
|
||||||
pub ui: Value,
|
pub ui: Value,
|
||||||
}
|
}
|
||||||
impl Database {
|
impl Database {
|
||||||
@@ -70,7 +69,6 @@ impl Database {
|
|||||||
},
|
},
|
||||||
package_data: AllPackageData::default(),
|
package_data: AllPackageData::default(),
|
||||||
recovered_packages: BTreeMap::new(),
|
recovered_packages: BTreeMap::new(),
|
||||||
broken_packages: Vec::new(),
|
|
||||||
ui: Value::Object(Default::default()),
|
ui: Value::Object(Default::default()),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -546,7 +546,6 @@ pub async fn install_s9pk_or_cleanup<R: AsyncRead + AsyncSeek + Unpin>(
|
|||||||
let mut tx = handle.begin().await?;
|
let mut tx = handle.begin().await?;
|
||||||
|
|
||||||
if let Err(e) = cleanup_failed(&ctx, &mut tx, pkg_id).await {
|
if let Err(e) = cleanup_failed(&ctx, &mut tx, pkg_id).await {
|
||||||
let mut tx = handle.begin().await?;
|
|
||||||
tracing::error!(
|
tracing::error!(
|
||||||
"Failed to clean up {}@{}: {}: Adding to broken packages",
|
"Failed to clean up {}@{}: {}: Adding to broken packages",
|
||||||
pkg_id,
|
pkg_id,
|
||||||
@@ -554,13 +553,6 @@ pub async fn install_s9pk_or_cleanup<R: AsyncRead + AsyncSeek + Unpin>(
|
|||||||
e
|
e
|
||||||
);
|
);
|
||||||
tracing::debug!("{:?}", e);
|
tracing::debug!("{:?}", e);
|
||||||
let mut broken = crate::db::DatabaseModel::new()
|
|
||||||
.broken_packages()
|
|
||||||
.get_mut(&mut tx)
|
|
||||||
.await?;
|
|
||||||
broken.push(pkg_id.clone());
|
|
||||||
broken.save(&mut tx).await?;
|
|
||||||
tx.commit(None).await?;
|
|
||||||
} else {
|
} else {
|
||||||
tx.commit(None).await?;
|
tx.commit(None).await?;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user