From cbc630823e875a56ef24775c064461d7b8f8c720 Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Fri, 20 Feb 2026 04:15:07 +0000
Subject: [PATCH] Try and copy all packages built
---
src/archrepobuild/builder.py | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/src/archrepobuild/builder.py b/src/archrepobuild/builder.py
index 4c0a9d0..84077ca 100644
--- a/src/archrepobuild/builder.py
+++ b/src/archrepobuild/builder.py
@@ -10,7 +10,9 @@
from enum import Enum
from pathlib import Path
from concurrent.futures import ProcessPoolExecutor
-from typing import Any
+from typing import Any, TYPE_CHECKING
+if TYPE_CHECKING:
+ from archrepobuild.repo import RepoManager
from archrepobuild.aur import AURClient
from archrepobuild.config import Config, PackageOverride
@@ -153,15 +155,18 @@
self,
config: Config,
aur_client: AURClient,
+ repo: RepoManager | None = None,
):
"""Initialize builder.
Args:
config: Application configuration
aur_client: AUR client for package info
+ repo: Optional repository manager for incremental registration
"""
self.config = config
self.aur_client = aur_client
+ self.repo = repo
self.resolver = DependencyResolver(aur_client)
self._lock_dir = config.repository.build_dir / ".locks"
self._executor: ProcessPoolExecutor | None = None
@@ -251,11 +256,16 @@
raise ValueError(f"Package not found in AUR: {package}")
pkg_dir.parent.mkdir(parents=True, exist_ok=True)
- subprocess.run(
- ["git", "clone", pkg_info.git_url, str(pkg_dir)],
- check=True,
- capture_output=True,
- )
+ try:
+ subprocess.run(
+ ["git", "clone", pkg_info.git_url, str(pkg_dir)],
+ check=True,
+ capture_output=True,
+ text=True,
+ )
+ except subprocess.CalledProcessError as e:
+ logger.error(f"Failed to clone {package} from {pkg_info.git_url}: {e.stderr}")
+ raise ValueError(f"Failed to clone package from AUR: {e.stderr}")
return True
def _is_vcs_package(self, package_dir: Path) -> bool:
@@ -518,7 +528,14 @@
final_results.append(result)
- if result.status == BuildStatus.FAILED:
+ if result.status == BuildStatus.SUCCESS:
+ if self.repo:
+ added = self.repo.add_packages(result)
+ if added:
+ logger.info(f"Added to repository: {', '.join(added)}")
+ # Refresh resolver cache to recognize the newly added packages
+ self.resolver._refresh_pacman_cache(sync=True)
+ elif result.status == BuildStatus.FAILED:
logger.error(f"Failed to process {pkg_name}, aborting")
if pkg_name == package:
return result
--
Gitblit v1.10.0