Recover from package file conflicts instead of predicting them
pacman refuses to install over a file it doesn't own, so any path an Omarchy package starts shipping that a script had already written by hand aborts the whole upgrade: omarchy-settings-dev: /usr/lib/systemd/user/omarchy-fcitx5.service exists in filesystem Errors occurred, no packages were upgraded. The mitigation was a hand-maintained --overwrite allowlist, and it only worked with foresight: an entry had to ship a release before the package took the path, because pacman checks conflicts during transaction prepare, so the script running the upgrade is the one already on disk. A missed entry left people hard-stuck, since the upgrade that would deliver the entry is the one refusing to run. So react instead. omarchy-update-system-pkgs now does the ordinary thing and hands a failed transaction to omarchy-update-system-pkgs-when- conflicted, which moves the offending files out of the way and runs the upgrade again. Nothing has to be predicted, and the allowlist is gone. Moving rather than overwriting is what makes it small: no --overwrite argument to build, no glob escaping, no separate backup step, and a leftover directory is cleared too, which --overwrite cannot do at all. Files go to /var/lib/omarchy/replaced/<original path>, not next to the original. A sibling copy is not inert -- SDDM reads every file in sddm.conf.d whatever its extension, and systemd-sleep runs every executable in system-sleep -- and the directory a future path lives in is unknowable, which is the whole point of a mechanism for paths nobody predicted. What it will not do: - Take a file another package owns. pacman reports those with a "(owned by x)" suffix, so the end anchor excludes them, and pacman -Qo re-checks the live database before anything moves. - Move a subset. If any reported conflict isn't recoverable the retry is doomed anyway, and moving leaves that config inactive for nothing -- worse than the stuck-but-intact state. - Leave anything inactive that was live. A failed retry, a failed move partway through the loop, or an interrupt all put back whatever the upgrade didn't install. - Act on a report handed to it by hand. It is internal to the update, and an old report would clear live files for an upgrade that isn't happening. Also adds a test that fails when a script writes a path under /usr that no PKGBUILD installs, since not creating these is cheaper than recovering from them. It reads the destination off the command, so a path assembled from variables still slips through; the two known cases are recorded with their reasons. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
David Heinemeier Hansson
co-authored by
Claude Opus 5
Claude Opus 5
parent
bdcdfeb428
commit
646587e316
@@ -7,42 +7,25 @@ set -e
|
||||
|
||||
echo -e "\e[32m\nUpdate system packages\e[0m"
|
||||
|
||||
# Transition --overwrite: previous script-installed Omarchy wrote these paths
|
||||
# as unowned files; pacman would refuse the omarchy-settings upgrade on first
|
||||
# encounter. Drop each entry once the transition release is the baseline.
|
||||
errors=$(mktemp)
|
||||
trap 'rm -f "$errors"' EXIT
|
||||
|
||||
# /usr/share/omarchy is wholly Omarchy's; files can land there unowned and would
|
||||
# otherwise abort the upgrade. Packaged content wins there.
|
||||
#
|
||||
# An entry has to ship at least one release before the package starts owning the
|
||||
# path. pacman checks file conflicts during transaction prepare, so the copy of
|
||||
# this script running the upgrade is the one already on disk.
|
||||
#
|
||||
# The /usr/share/omarchy/* entry is permanent: that tree is wholly owned by
|
||||
# the omarchy packages, but files can land there unowned (in-place extension
|
||||
# work, script-written files), which would abort the whole upgrade. Packaged
|
||||
# content always wins there.
|
||||
sudo env OMARCHY_UPDATE_PACMAN=1 pacman -Syu --noconfirm \
|
||||
--overwrite '/etc/docker/daemon.json' \
|
||||
--overwrite '/etc/gnupg/dirmngr.conf' \
|
||||
--overwrite '/etc/mkinitcpio.conf.d/omarchy_hooks.conf' \
|
||||
--overwrite '/etc/mkinitcpio.conf.d/thunderbolt_module.conf' \
|
||||
--overwrite '/etc/modprobe.d/omarchy-usb-autosuspend.conf' \
|
||||
--overwrite '/etc/sddm.conf.d/10-theme.conf' \
|
||||
--overwrite '/etc/sddm.conf.d/10-wayland.conf' \
|
||||
--overwrite '/etc/sudoers.d/omarchy-asdcontrol' \
|
||||
--overwrite '/etc/sudoers.d/omarchy-passwd-tries' \
|
||||
--overwrite '/etc/sudoers.d/omarchy-tzupdate' \
|
||||
--overwrite '/etc/sysctl.d/90-omarchy-file-watchers.conf' \
|
||||
--overwrite '/etc/sysctl.d/99-omarchy-sysctl.conf' \
|
||||
--overwrite '/etc/systemd/logind.conf.d/10-ignore-power-button.conf' \
|
||||
--overwrite '/etc/systemd/resolved.conf.d/10-disable-multicast.conf' \
|
||||
--overwrite '/etc/systemd/resolved.conf.d/20-docker-dns.conf' \
|
||||
--overwrite '/etc/systemd/system.conf.d/10-faster-shutdown.conf' \
|
||||
--overwrite '/etc/systemd/system/user@.service.d/10-faster-shutdown.conf' \
|
||||
--overwrite '/etc/systemd/system/docker.service.d/no-block-boot.conf' \
|
||||
--overwrite '/etc/systemd/system/plocate-updatedb.service.d/ac-only.conf' \
|
||||
--overwrite '/etc/systemd/system.conf.d/20-omarchy-nofile.conf' \
|
||||
--overwrite '/etc/systemd/user.conf.d/20-omarchy-nofile.conf' \
|
||||
--overwrite '/usr/lib/systemd/system-sleep/unmount-fuse' \
|
||||
--overwrite '/usr/share/plymouth/themes/omarchy/*' \
|
||||
--overwrite '/usr/share/sddm/hyprland.lua' \
|
||||
--overwrite '/usr/share/sddm/themes/omarchy/*' \
|
||||
--overwrite '/usr/share/omarchy/*'
|
||||
# Progress bars stay on stdout. Errors are on stderr, kept for the conflict
|
||||
# handler below; LC_ALL=C is what keeps them parseable in any locale.
|
||||
if sudo env LC_ALL=C OMARCHY_UPDATE_PACMAN=1 pacman -Syu --noconfirm \
|
||||
--overwrite '/usr/share/omarchy/*' 2>"$errors"; then
|
||||
cat "$errors" >&2
|
||||
exit 0
|
||||
fi
|
||||
cat "$errors" >&2
|
||||
|
||||
# An upgrade blocked only by files pacman doesn't own yet is the one failure
|
||||
# worth retrying: the handler clears them and runs this again. Anything else,
|
||||
# including a second failure, is for a human.
|
||||
[[ ${OMARCHY_UPDATE_RETRY:-} != 1 ]] || exit 1
|
||||
# exec, so the EXIT trap above does not fire and the handler can still read the
|
||||
# report. It takes over deleting it.
|
||||
exec env OMARCHY_UPDATE_CONFLICT=1 omarchy-update-system-pkgs-when-conflicted "$errors"
|
||||
|
||||
+88
@@ -0,0 +1,88 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Internal to omarchy-update-system-pkgs. Not a command to run by hand: it acts
|
||||
# on a pacman error report, and an old or hand-written one would move live files
|
||||
# out of the way for an upgrade that is not happening.
|
||||
#
|
||||
# Paths written by a script rather than installed by a package -- an earlier
|
||||
# release's installer, an in-place edit -- belong to nobody, and pacman refuses
|
||||
# to install over a file it doesn't own. This clears them and runs the upgrade
|
||||
# again.
|
||||
|
||||
set -e
|
||||
|
||||
[[ ${OMARCHY_UPDATE_CONFLICT:-} == 1 ]] || {
|
||||
echo "omarchy-update-system-pkgs-when-conflicted runs as part of omarchy update" >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
errors=${1:?usage: omarchy-update-system-pkgs-when-conflicted <pacman-error-report>}
|
||||
|
||||
# Where a file pacman is taking over gets moved, mirroring its full path. Kept
|
||||
# out of the directory it came from: SDDM reads every file in sddm.conf.d
|
||||
# whatever its extension, and systemd-sleep runs every executable in
|
||||
# system-sleep, so a copy left beside the original would still be live.
|
||||
replaced=${OMARCHY_REPLACED_DIR:-/var/lib/omarchy/replaced}
|
||||
|
||||
# Anything moved that the upgrade didn't end up installing goes back, whether
|
||||
# the retry failed or the move loop itself was interrupted partway. Nothing here
|
||||
# should leave configuration inactive that was live when it started.
|
||||
#
|
||||
# -e follows symlinks, so a dangling one reads as absent. -L catches those: a
|
||||
# link pacman installed, and a relative link that no longer resolves from inside
|
||||
# the quarantine.
|
||||
moved=()
|
||||
restore_moved() {
|
||||
local path restorable=()
|
||||
|
||||
for path in "${moved[@]}"; do
|
||||
if [[ ! -e $path && ! -L $path ]] && [[ -e $replaced$path || -L $replaced$path ]]; then
|
||||
restorable+=("$path")
|
||||
fi
|
||||
done
|
||||
((${#restorable[@]})) || return 0
|
||||
|
||||
echo -e "\e[33m\nPutting back what the upgrade didn't take:\e[0m"
|
||||
for path in "${restorable[@]}"; do
|
||||
sudo mv -T "$replaced$path" "$path"
|
||||
echo " $path"
|
||||
done
|
||||
}
|
||||
|
||||
# exec'd into, so the caller's EXIT trap never ran and the report is still here.
|
||||
# Cleaning it up is this script's job from now on.
|
||||
trap 'restore_moved; rm -f "$errors"' EXIT
|
||||
trap 'exit 1' INT TERM
|
||||
|
||||
# Paths one of these packages installs that pacman doesn't own. Moving them out
|
||||
# of the way is what lets the upgrade through, and works on a leftover directory
|
||||
# as well as a file.
|
||||
#
|
||||
# "pkg: /path exists in filesystem" is unowned; the same line plus "(owned by
|
||||
# x)" is not, so the end anchor takes only ours. -Qo re-checks the live database
|
||||
# before anything moves.
|
||||
mapfile -t leftovers < <(
|
||||
grep -oP '^omarchy(-dev|-settings|-settings-dev)?: \K.+(?= exists in filesystem$)' "$errors" |
|
||||
while IFS= read -r path; do pacman -Qo "$path" &>/dev/null || echo "$path"; done
|
||||
)
|
||||
((${#leftovers[@]})) || exit 1
|
||||
|
||||
# All of them or none: moving a subset leaves the retry blocked by the rest, and
|
||||
# the moved files inactive for nothing.
|
||||
((${#leftovers[@]} == $(grep -c ' exists in filesystem' "$errors"))) || exit 1
|
||||
|
||||
echo -e "\e[33m\nTaking over files pacman doesn't own yet:\e[0m"
|
||||
for path in "${leftovers[@]}"; do
|
||||
sudo mkdir -p "$replaced${path%/*}"
|
||||
# -T so an existing directory at the destination is replaced, not moved into.
|
||||
sudo mv -T --backup=numbered "$path" "$replaced$path"
|
||||
moved+=("$path")
|
||||
echo " $path -> $replaced$path"
|
||||
done
|
||||
echo
|
||||
|
||||
if OMARCHY_UPDATE_RETRY=1 omarchy-update-system-pkgs; then
|
||||
moved=()
|
||||
exit 0
|
||||
fi
|
||||
exit 1
|
||||
Reference in New Issue
Block a user