From 7ab8d86396cf84cfeedae086f261b9596691d748 Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Sun, 08 Feb 2026 01:15:14 +0000
Subject: [PATCH] Try to allow vcs rebuilds
---
src/archrepobuild/cli.py | 38 ++++++++++++++++++++------------------
1 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/src/archbuild/cli.py b/src/archrepobuild/cli.py
similarity index 93%
rename from src/archbuild/cli.py
rename to src/archrepobuild/cli.py
index a05b9ba..79d98f2 100644
--- a/src/archbuild/cli.py
+++ b/src/archrepobuild/cli.py
@@ -9,13 +9,13 @@
from rich.console import Console
from rich.table import Table
-from archbuild import __version__
-from archbuild.aur import AURClient
-from archbuild.builder import Builder, BuildStatus
-from archbuild.config import Config, load_config, migrate_vars_sh, save_config
-from archbuild.logging import console as log_console, setup_logging
-from archbuild.notifications import NotificationManager
-from archbuild.repo import RepoManager
+from archrepobuild import __version__
+from archrepobuild.aur import AURClient
+from archrepobuild.builder import Builder, BuildStatus
+from archrepobuild.config import Config, load_config, migrate_vars_sh, save_config
+from archrepobuild.logging import console as log_console, setup_logging
+from archrepobuild.notifications import NotificationManager
+from archrepobuild.repo import RepoManager
console = Console()
@@ -50,7 +50,7 @@
default=Path("config.yaml"),
help="Path to configuration file",
)
-@click.version_option(__version__, prog_name="archbuild")
+@click.version_option(__version__, prog_name="archrepobuild")
@click.pass_context
def cli(ctx: click.Context, config: Path) -> None:
"""Archbuild - Automatic AUR package building and repository management.
@@ -136,6 +136,8 @@
if result.status == BuildStatus.SUCCESS:
repo.add_packages(result)
console.print(f"[green]✓[/] {package} added successfully")
+ elif result.status == BuildStatus.SKIPPED:
+ console.print(f"[yellow]⏭[/] {package} skipped (already in official repos or installed)")
else:
console.print(f"[red]✗[/] {package} failed: {result.error}")
@@ -159,7 +161,7 @@
if all_official:
# Find packages now in official repos
- from archbuild.resolver import DependencyResolver
+ from archrepobuild.resolver import DependencyResolver
resolver = DependencyResolver(aur)
for pkg in repo.list_packages():
@@ -184,7 +186,7 @@
async def _check() -> None:
async with AURClient() as aur:
- from archbuild.resolver import DependencyResolver
+ from archrepobuild.resolver import DependencyResolver
resolver = DependencyResolver(aur)
repo = RepoManager(config)
@@ -362,12 +364,12 @@
interval = click.prompt("How often should builds run? (systemd Calendar spec, e.g., 12h, daily)", default="12h")
- # Get absolute path to archbuild executable
+ # Get absolute path to archrepobuild executable
import shutil
- archbuild_path = shutil.which("archbuild")
- if not archbuild_path:
+ archrepobuild_path = shutil.which("archrepobuild")
+ if not archrepobuild_path:
# Fallback to current sys.executable if running as module or in venv
- archbuild_path = f"{sys.executable} -m archbuild.cli"
+ archrepobuild_path = f"{sys.executable} -m archrepobuild.cli"
user_systemd_dir = Path.home() / ".config" / "systemd" / "user"
user_systemd_dir.mkdir(parents=True, exist_ok=True)
@@ -378,7 +380,7 @@
[Service]
Type=oneshot
-ExecStart={archbuild_path} build-all
+ExecStart={archrepobuild_path} build-all
Environment="PATH={Path.home()}/.local/bin:/usr/bin:/bin"
"""
@@ -393,15 +395,15 @@
WantedBy=timers.target
"""
- service_file = user_systemd_dir / "archbuild.service"
- timer_file = user_systemd_dir / "archbuild.timer"
+ service_file = user_systemd_dir / "archrepobuild.service"
+ timer_file = user_systemd_dir / "archrepobuild.timer"
service_file.write_text(service_content)
timer_file.write_text(timer_content)
try:
subprocess.run(["systemctl", "--user", "daemon-reload"], check=True)
- subprocess.run(["systemctl", "--user", "enable", "--now", "archbuild.timer"], check=True)
+ subprocess.run(["systemctl", "--user", "enable", "--now", "archrepobuild.timer"], check=True)
console.print(f"[green]✓[/] Systemd timer enabled (running every {interval})")
except subprocess.CalledProcessError as e:
console.print(f"[red]✗[/] Failed to enable systemd timer: {e}")
--
Gitblit v1.10.0