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.

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

Add back hardcoded self-protection of dnf #1621

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion VERSION.cmake
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
set (DEFAULT_LIBDNF_MAJOR_VERSION 0)
set (DEFAULT_LIBDNF_MINOR_VERSION 71)
set (DEFAULT_LIBDNF_MICRO_VERSION 0)
set (DEFAULT_LIBDNF_MICRO_VERSION 1)

if(DEFINED LIBDNF_MAJOR_VERSION)
if(NOT ${DEFAULT_LIBDNF_MAJOR_VERSION} STREQUAL ${LIBDNF_MAJOR_VERSION})
Expand Down
9 changes: 9 additions & 0 deletions docs/release_notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,15 @@
LIBDNF Release Notes
######################

====================
0.71.1 Release Notes
====================

- New features:
- Allow DNF to be removed by DNF 5

Bugs fixed in 0.71.1:

====================
0.71.0 Release Notes
====================
Expand Down
2 changes: 1 addition & 1 deletion libdnf.spec
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
%global swig_version 3.0.12
%global libdnf_major_version 0
%global libdnf_minor_version 71
%global libdnf_micro_version 0
%global libdnf_micro_version 1

%define __cmake_in_source_build 1

Expand Down
5 changes: 3 additions & 2 deletions libdnf/conf/ConfigMain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -313,8 +313,9 @@ class ConfigMain::Impl {
}
};

OptionStringList protected_packages{resolveGlobs("glob:/etc/yum/protected.d/*.conf " \
"glob:/etc/dnf/protected.d/*.conf")};
OptionStringList protected_packages{resolveGlobs("dnf " \
"glob:/etc/yum/protected.d/*.conf " \
"glob:/etc/dnf/protected.d/*.conf")};
OptionString username{""};
OptionString password{""};
OptionBool gpgcheck{false};
Expand Down
Loading