Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow obsoletion of protected packages #1610

Merged
merged 1 commit into from
Sep 19, 2023
Merged

Allow obsoletion of protected packages #1610

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions libdnf/goal/Goal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1631,12 +1631,24 @@ Goal::Impl::protectedInRemovals()
if ((!protectedPkgs || !protectedPkgs->size()) && !protect_running_kernel)
return false;
auto pkgRemoveList = listResults(SOLVER_TRANSACTION_ERASE, 0);
Id protected_kernel = protectedRunningKernel();
auto pkgObsoleteList = listResults(SOLVER_TRANSACTION_OBSOLETED, 0);
map_or(pkgRemoveList.getMap(), pkgObsoleteList.getMap());
// Special case: consider the obsoletion of the running kernel as a
// removal. Obsoletion of other protected packages should be allowed.
for (size_t obsolete_index = 0; obsolete_index < pkgObsoleteList.size(); obsolete_index += 1) {
if (protected_kernel == pkgObsoleteList[obsolete_index]) {
pkgRemoveList.set(protected_kernel);
}
}

// We want to allow obsoletion of protected packages, so we do not consider
// obsoletes here, only removes. Previously, obsoletion of protected
// packages was disallowed, but there needed to be some mechanism for
// obsoleting/swapping a protected package, such as to obsolete `dnf` in
// favor of `dnf5`. Obsoleting a package is much harder to do accidentally
// than removing it.
removalOfProtected.reset(new PackageSet(pkgRemoveList));
Id id = -1;
Id protected_kernel = protectedRunningKernel();
while(true) {
id = removalOfProtected->next(id);
if (id == -1)
Expand Down