lukas/aurcache
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix built pkg not found for any archs

Browse Source
This commit is contained in:
lukas-heiligenbrunner 2024-01-13 14:23:10 +01:00
parent e74a9607a3
commit 64ef138302
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/builder/builder.rs
View File

@ -19,7 +19,7 @@ pub async fn init(db: DatabaseConnection, tx: Sender<Action>) {
if let Ok(_result) = tx.subscribe().recv().await { if let Ok(_result) = tx.subscribe().recv().await {
match _result { match _result {
// add a package to parallel build // add a package to parallel build
Action::Build(name, version, url, mut version_model) => { Action::Build(name, version, url, version_model) => {
let _ = queue_package( let _ = queue_package(
name, name,
version, version,
@ -39,7 +39,7 @@ async fn queue_package(
name: String, name: String,
version: String, version: String,
url: String, url: String,
mut version_model: versions::ActiveModel, version_model: versions::ActiveModel,
db: DatabaseConnection, db: DatabaseConnection,
semaphore: Arc<Semaphore>, semaphore: Arc<Semaphore>,
) -> anyhow::Result<()> { ) -> anyhow::Result<()> {

3
backend/src/pkgbuild/build.rs
View File

@ -11,6 +11,7 @@ pub async fn build_pkgbuild(
pkg_name: &str, pkg_name: &str,
tx: Sender<String>, tx: Sender<String>,
) -> anyhow::Result<String> { ) -> anyhow::Result<String> {
// update pacman cache
let mut child = tokio::process::Command::new("pacman") let mut child = tokio::process::Command::new("pacman")
.args([ .args([
"-Sy", "-Sy",
@ -111,7 +112,7 @@ fn locate_built_package(
if let Some(file_name) = path.file_name() { if let Some(file_name) = path.file_name() {
let file_name = file_name.to_str().unwrap(); 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()) && file_name.starts_with(pkg_name.as_str())
{ {
if let Ok(metadata) = path.metadata() { if let Ok(metadata) = path.metadata() {