From 64ef138302c9ea81fafd5c334f09588b09e26228 Mon Sep 17 00:00:00 2001 From: lukas-heiligenbrunner Date: Sat, 13 Jan 2024 14:23:10 +0100 Subject: [PATCH] fix built pkg not found for any archs --- backend/src/builder/builder.rs | 4 ++-- backend/src/pkgbuild/build.rs | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/backend/src/builder/builder.rs b/backend/src/builder/builder.rs index 1039947..9dfdc2f 100644 --- a/backend/src/builder/builder.rs +++ b/backend/src/builder/builder.rs @@ -19,7 +19,7 @@ pub async fn init(db: DatabaseConnection, tx: Sender) { if let Ok(_result) = tx.subscribe().recv().await { match _result { // add a package to parallel build - Action::Build(name, version, url, mut version_model) => { + Action::Build(name, version, url, version_model) => { let _ = queue_package( name, version, @@ -39,7 +39,7 @@ async fn queue_package( name: String, version: String, url: String, - mut version_model: versions::ActiveModel, + version_model: versions::ActiveModel, db: DatabaseConnection, semaphore: Arc, ) -> anyhow::Result<()> { diff --git a/backend/src/pkgbuild/build.rs b/backend/src/pkgbuild/build.rs index 48e2442..5186df7 100644 --- a/backend/src/pkgbuild/build.rs +++ b/backend/src/pkgbuild/build.rs @@ -11,6 +11,7 @@ pub async fn build_pkgbuild( pkg_name: &str, tx: Sender, ) -> anyhow::Result { + // update pacman cache let mut child = tokio::process::Command::new("pacman") .args([ "-Sy", @@ -111,7 +112,7 @@ fn locate_built_package( if let Some(file_name) = path.file_name() { let file_name = file_name.to_str().unwrap(); - if file_name.ends_with("-x86_64.pkg.tar.zst") + if file_name.ends_with(".pkg.tar.zst") && file_name.starts_with(pkg_name.as_str()) { if let Ok(metadata) = path.metadata() {