From 40c68b29c46f28a10cbba0d725afd4f055cb5d5a Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Fri, 20 Feb 2026 03:52:01 +0000
Subject: [PATCH] More tries at dep res
---
src/archrepobuild/cli.py | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/archrepobuild/cli.py b/src/archrepobuild/cli.py
index b60c83d..e7ef98e 100644
--- a/src/archrepobuild/cli.py
+++ b/src/archrepobuild/cli.py
@@ -135,9 +135,9 @@
if result.status == BuildStatus.SUCCESS:
repo.add_packages(result)
- console.print(f"[green]✓[/] {package} added successfully")
+ console.print(f"[green]✓[/] {package} processed successfully")
elif result.status == BuildStatus.SKIPPED:
- console.print(f"[yellow]⏭[/] {package} skipped (already in official repos or installed)")
+ console.print(f"[yellow]⏭[/] {package} skipped (already in managed repository)")
else:
console.print(f"[red]✗[/] {package} failed: {result.error}")
@@ -165,8 +165,8 @@
resolver = DependencyResolver(aur)
for pkg in repo.list_packages():
- if resolver.is_in_official_repos(pkg.name):
- console.print(f"[yellow]Removing {pkg.name}[/] (now in official repos)")
+ if resolver.is_in_repos(pkg.name):
+ console.print(f"[yellow]Removing {pkg.name}[/] (now in repositories)")
builder.remove_package(pkg.name)
repo.remove_package(pkg.name)
else:
@@ -200,10 +200,10 @@
# Ignore debug packages if the regular version is in official repos
if pkg.name.endswith("-debug"):
base_name = pkg.name[:-6]
- if resolver.is_in_official_repos(base_name, include_all=all_repos):
+ if resolver.is_in_repos(base_name, include_all=all_repos) or await aur.is_available(base_name):
continue
- if resolver.is_in_official_repos(pkg.name, include_all=all_repos):
+ if resolver.is_in_repos(pkg.name, include_all=all_repos):
in_official.append(pkg.name)
elif not await aur.is_available(pkg.name):
not_in_aur.append(pkg.name)
--
Gitblit v1.10.0