Revert "Make sure dnf won't autoremove packages that we explicitly installed"

This reverts commit b544e91494.

This work-around for very early dnf is now causing other problems
building with RHEL images [1].  It's likely that the bug talked about
in the original change where packages were removed despite being
explicitly installed is no longer an issue.  I think we can revert
this now.

[1] https://bugzilla.redhat.com/show_bug.cgi?id=1925243

Change-Id: I45cb4d526071a0f4c2f28a4917e4453ab08336fe
This commit is contained in:
Ian Wienand 2021-02-16 15:36:43 +11:00
parent cbbcf377d8
commit 4f2613d815
2 changed files with 0 additions and 19 deletions

View File

@ -135,13 +135,6 @@ if [ -n "$WHITELIST" ]; then
# [1] https://bugzilla.redhat.com/show_bug.cgi?id=965567
set -o xtrace
${YUM} -v -y $ACTION $EXTRA_ARGS $PKGS
if [ "$ACTION" == "install" ]; then
if [ ${YUM} == "dnf" ]; then
# Make sure dnf won't autoremove these packages
dnf mark install $PKGS
fi
fi
$_xtrace
# probably not the right place for this; but python-pip package on

View File

@ -1,12 +0,0 @@
#!/bin/bash
if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
set -x
fi
set -eu
set -o pipefail
if [[ $DISTRO_NAME == "fedora" && $DIB_RELEASE -eq 22 ]]; then
# we need dnf mark command from dnf 1.1.1, which is pretty recent
dnf --refresh update -y dnf
fi