Merge branch 'fix/9457-e-20260917' into fix/9469-c-20260917

This commit is contained in:
Afonso Oliveira committed 2026-09-17 20:48:14 +01:00
commit 689771bdc1
2 files changed
+54 -4

No files matched your search

+3 -1
View File
@@ -86,7 +86,9 @@ with_root_lock() {
exec {fd}>"$LOCK_FILE" || return 1
/usr/bin/chown root:root "$LOCK_FILE" || return 1
/usr/bin/chmod 0600 "$LOCK_FILE" || return 1
/usr/bin/flock -x "$fd" || return 1
# Grant operations are short. A stalled holder must not hang a caller
# indefinitely, least of all pacman's pre-transaction hook.
/usr/bin/flock -x -w 60 "$fd" || return 1
"$@" || rc=$?
/usr/bin/flock -u "$fd" || rc=1
exec {fd}>&-