mirror of
https://github.com/agent0ai/agent-zero.git
synced 2026-05-17 04:01:13 +00:00
ef011600ef
Run Office and Desktop apt operations through a shared in-process retry guard so startup/self-update hooks wait out transient apt locks instead of failing early. Include LibreOffice runtime packages in Desktop preparation because Desktop status and Writer/Calc/Impress launch paths require soffice, and cover both behaviors with regression tests.
42 lines
1.3 KiB
Python
42 lines
1.3 KiB
Python
from __future__ import annotations
|
|
|
|
import subprocess
|
|
import threading
|
|
import time
|
|
from typing import Callable
|
|
|
|
|
|
APT_LOCK_TIMEOUT_SECONDS = 240
|
|
APT_LOCK_RETRY_SECONDS = 5
|
|
|
|
_apt_lock = threading.RLock()
|
|
|
|
|
|
def run_apt_with_retries(
|
|
runner: Callable[[], subprocess.CompletedProcess[str]],
|
|
*,
|
|
lock_timeout_seconds: int = APT_LOCK_TIMEOUT_SECONDS,
|
|
retry_seconds: int = APT_LOCK_RETRY_SECONDS,
|
|
) -> subprocess.CompletedProcess[str]:
|
|
"""Run an apt/dpkg command, serializing in-process callers and waiting out apt locks."""
|
|
|
|
with _apt_lock:
|
|
deadline = time.monotonic() + max(0, lock_timeout_seconds)
|
|
while True:
|
|
result = runner()
|
|
if result.returncode == 0 or not is_apt_lock_error(result):
|
|
return result
|
|
remaining = deadline - time.monotonic()
|
|
if remaining <= 0:
|
|
return result
|
|
time.sleep(min(max(1, retry_seconds), remaining))
|
|
|
|
|
|
def is_apt_lock_error(result: subprocess.CompletedProcess[str]) -> bool:
|
|
output = f"{result.stderr or ''}\n{result.stdout or ''}".lower()
|
|
return (
|
|
"could not get lock" in output
|
|
or "unable to lock directory" in output
|
|
or "unable to acquire the dpkg frontend lock" in output
|
|
or "is another process using it" in output
|
|
)
|