From f250049cca24d7178cb52569c1da4273884e5aa8 Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Tue, 03 Mar 2026 00:47:01 +0000
Subject: [PATCH] Rebuild if in config repo
---
src/archrepobuild/resolver.py | 80 +++++++++++++++++++++++++++++++---------
1 files changed, 62 insertions(+), 18 deletions(-)
diff --git a/src/archrepobuild/resolver.py b/src/archrepobuild/resolver.py
index 1fc9b2f..b406119 100644
--- a/src/archrepobuild/resolver.py
+++ b/src/archrepobuild/resolver.py
@@ -78,9 +78,22 @@
self._pacman_cache: dict[str, set[str]] = {} # repo -> packages
self._pacman_checked = False
- def _refresh_pacman_cache(self) -> None:
- """Refresh cache of packages available from official repos."""
+ def _refresh_pacman_cache(self, sync: bool = False) -> None:
+ """Refresh cache of packages available from official repos.
+
+ Args:
+ sync: Whether to synchronize pacman databases first using sudo pacman -Sy
+ """
try:
+ if sync:
+ logger.info("Synchronizing pacman databases...")
+ subprocess.run(
+ ["sudo", "pacman", "-Sy", "--noconfirm"],
+ capture_output=True,
+ text=True,
+ check=True,
+ )
+
result = subprocess.run(
["pacman", "-Sl"],
capture_output=True,
@@ -102,10 +115,11 @@
total_pkgs = sum(len(pkgs) for pkgs in self._pacman_cache.values())
logger.debug(f"Cached {total_pkgs} packages from {len(self._pacman_cache)} repos")
except subprocess.CalledProcessError as e:
- logger.warning(f"Failed to get pacman package list: {e}")
- self._pacman_cache = {}
+ logger.warning(f"Failed to refresh pacman cache: {e}")
+ if not self._pacman_cache:
+ self._pacman_cache = {}
- def is_in_repos(self, name: str, include_all: bool = True) -> bool:
+ def is_in_repos(self, name: str, include_all: bool = True) -> str | None:
"""Check if package is available in repositories.
Args:
@@ -113,7 +127,7 @@
include_all: If True, check all enabled repos. If False, only official ones.
Returns:
- True if available in repos
+ Name of repository where package was found, or None if not found
"""
if not self._pacman_checked:
self._refresh_pacman_cache()
@@ -125,8 +139,38 @@
if not include_all and repo not in OFFICIAL_REPOS:
continue
if base_name in pkgs:
- return True
- return False
+ return repo
+
+ # Fallback: check provides via pacman -Sp
+ try:
+ # Use pacman -Sp --noconfirm to see if pacman can resolve it
+ result = subprocess.run(
+ ["pacman", "-Sp", "--noconfirm", base_name],
+ capture_output=True,
+ text=True,
+ )
+ if result.returncode == 0:
+ # Successfully resolved. Find what it resolved to.
+ # Output looks like: file:///var/cache/pacman/pkg/name-version...
+ output = result.stdout.strip().split("\n")[-1]
+ if output:
+ filename = output.split("/")[-1]
+ # The package name is before the version
+ import re
+ match = re.search(r"^(.*?)-[0-9].*", filename)
+ if match:
+ resolved_name = match.group(1)
+ # Now check which repo this resolved_name belongs to
+ # We already have resolved_name in our cache if it's in a repo
+ for repo, pkgs in self._pacman_cache.items():
+ if not include_all and repo not in OFFICIAL_REPOS:
+ continue
+ if resolved_name in pkgs:
+ return repo
+ except Exception as e:
+ logger.debug(f"Failed to resolve provides for {base_name}: {e}")
+
+ return None
def is_installed(self, name: str) -> bool:
"""Check if package is already installed.
@@ -177,11 +221,9 @@
dep_parsed = Dependency.parse(dep)
base_name = dep_parsed.name
- # Skip if in repos or already installed
+ # Skip if in repos
if self.is_in_repos(base_name):
continue
- if self.is_installed(base_name):
- continue
aur_deps.append(base_name)
graph[package.name].add(base_name)
@@ -281,11 +323,12 @@
return cycles
- async def resolve(self, package_names: list[str]) -> BuildOrder:
+ async def resolve(self, package_names: list[str], exclude_repo: str | None = None) -> BuildOrder:
"""Resolve dependencies and determine build order.
Args:
package_names: List of packages to resolve
+ exclude_repo: Optional repository name to exclude from existence checks
Returns:
BuildOrder with packages in correct build order
@@ -296,12 +339,13 @@
# Filter out packages already in repos or installed
aur_package_names = []
for name in package_names:
- if self.is_in_repos(name):
- logger.info(f"Package {name} found in repositories, skipping AUR lookup")
- continue
- if self.is_installed(name):
- logger.info(f"Package {name} is already installed, skipping AUR lookup")
- continue
+ repo = self.is_in_repos(name)
+ if repo:
+ if exclude_repo and repo == exclude_repo:
+ logger.debug(f"Package {name} found in excluded repo {repo}, treating as not in repos")
+ else:
+ logger.info(f"Package {name} found in {repo}, skipping AUR lookup")
+ continue
aur_package_names.append(name)
if not aur_package_names:
--
Gitblit v1.10.0