Automatically approve orphan removal during updates (#14428)
This commit is contained in:
1 parent
2fa6d0ecc5
commit
402128b6a2
5 files changed
+41
-10
No files matched your search
@@ -35,6 +35,9 @@ for step in "${steps[@]}"; do
|
||||
cat >"$stub_bin/$step" <<'STUB'
|
||||
#!/bin/bash
|
||||
printf '%s unattended=%s\n' "${0##*/}" "${OMARCHY_UPDATE_UNATTENDED:-}" >>"$STEP_LOG"
|
||||
if [[ ${0##*/} == "omarchy-update-orphan-pkgs" ]]; then
|
||||
printf '%s\n' "$@" >"$STEP_LOG.orphan-args"
|
||||
fi
|
||||
[[ ${FAILING_STEP:-} != "${0##*/}" ]] || exit 1
|
||||
STUB
|
||||
chmod +x "$stub_bin/$step"
|
||||
@@ -84,6 +87,8 @@ run_update -y || fail "an update where everything works reports a failure"
|
||||
diff <(expected_steps) <(steps_run) >"$test_tmp/order" ||
|
||||
fail "an update where everything works does not run every step in order" "$(cat "$test_tmp/order")"
|
||||
pass "an update where every step works runs all of them, in order"
|
||||
[[ $(cat "$test_tmp/steps.orphan-args") == "-y" ]] || fail "an unattended update approves orphan removal"
|
||||
pass "an unattended update approves orphan removal"
|
||||
|
||||
grep -q '^omarchy-update-system-pkgs unattended=1$' "$test_tmp/steps" ||
|
||||
fail "-y does not mark the update unattended"
|
||||
@@ -93,6 +98,8 @@ diff <(expected_steps confirmed) <(steps_run) >"$test_tmp/order" ||
|
||||
grep -q '^omarchy-update-system-pkgs unattended=$' "$test_tmp/steps" ||
|
||||
fail "an update a person confirmed is treated as unattended"
|
||||
pass "-y is what marks an update unattended, not the update itself"
|
||||
[[ $(cat "$test_tmp/steps.orphan-args") == "-y" ]] || fail "a confirmed update approves orphan removal"
|
||||
pass "a confirmed update approves orphan removal"
|
||||
|
||||
# Migrations ship with the packages the upgrade installs and are written against
|
||||
# them. Running them against what is still on disk is the failure this ordering
|
||||
|
||||
Reference in new issue
Block a user