From ff11c498f17e4c8887e00bd3fefab9db684575bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Mon, 3 Mar 2025 15:17:33 +0100 Subject: [PATCH] dom0-updates: do not pass --allowerasing to dnf clean QubesOS/qubes-issues#9244 --- package-managers/qubes-download-dom0-updates.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package-managers/qubes-download-dom0-updates.sh b/package-managers/qubes-download-dom0-updates.sh index 1b4efaa1f..232d87ca5 100755 --- a/package-managers/qubes-download-dom0-updates.sh +++ b/package-managers/qubes-download-dom0-updates.sh @@ -71,6 +71,7 @@ fi if type dnf >/dev/null 2>&1; then UPDATE_CMD=dnf UPDATE_ARGUMENTS+=(--noplugins -y) + CLEAN_OPTS+=(--noplugins -y) "$UPDATE_CMD" "${OPTS[@]}" "$UPDATE_ACTION" --help | grep -q best && UPDATE_ARGUMENTS+=(--best) "$UPDATE_CMD" "${OPTS[@]}" "$UPDATE_ACTION" --help | grep -q allowerasing && UPDATE_ARGUMENTS+=(--allowerasing) if "$UPDATE_CMD" --version | grep -q dnf5 && [ "$CHECK_ONLY" = "1" ]; then @@ -116,7 +117,7 @@ rpm --root=$DOM0_UPDATES_DIR --rebuilddb if [ "$CLEAN" = "1" ]; then # shellcheck disable=SC2086 - $UPDATE_CMD clean all "${UPDATE_ARGUMENTS[@]}" "${CLEAN_OPTS[@]}" + $UPDATE_CMD clean all "${CLEAN_OPTS[@]}" rm -f "$DOM0_UPDATES_DIR"/packages/* rm -rf "$DOM0_UPDATES_DIR"/var/cache/* fi