New version 33.25.2-2

- Always clear treeinfo metadata (#1872056) (jkonecny)
This commit is contained in:
Martin Kolman 2020-09-07 14:52:12 +02:00
parent 985d196ff5
commit e51656a3f4
2 changed files with 38 additions and 1 deletions

View File

@ -0,0 +1,31 @@
From 9ef262fbd07508a5dd9becb30a0136fded45e792 Mon Sep 17 00:00:00 2001
From: Jiri Konecny <jkonecny@redhat.com>
Date: Thu, 3 Sep 2020 14:53:18 +0200
Subject: [PATCH] Always clear treeinfo metadata (#1872056)
Metadata from the treeinfo were loaded only during the load of new metadata.
However, this does not work if we have source without metadata (e.g.
mirrorlist). In that case we are loading additional repositories from the old
metadata (not mounted anymore) and not the new ones which may have unexpected
results.
Resolves: rhbz#1872056
---
pyanaconda/payload/dnf/payload.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/pyanaconda/payload/dnf/payload.py b/pyanaconda/payload/dnf/payload.py
index 5fba7e0e7..880886685 100644
--- a/pyanaconda/payload/dnf/payload.py
+++ b/pyanaconda/payload/dnf/payload.py
@@ -1477,6 +1477,7 @@ class DNFPayload(Payload):
def reset(self):
tear_down_sources(self.proxy)
self.reset_additional_repos()
+ self._install_tree_metadata = None
shutil.rmtree(DNF_CACHE_DIR, ignore_errors=True)
shutil.rmtree(DNF_PLUGINCONF_DIR, ignore_errors=True)
--
2.26.2

View File

@ -1,7 +1,7 @@
Summary: Graphical system installer
Name: anaconda
Version: 33.25.2
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2+ and MIT
URL: http://fedoraproject.org/wiki/Anaconda
@ -12,6 +12,9 @@ URL: http://fedoraproject.org/wiki/Anaconda
# make dist
Source0: %{name}-%{version}.tar.bz2
# F33 Beta blocker
Patch1: 0001-Always-clear-treeinfo-metadata-1872056.patch
# Versions of required components (done so we make sure the buildrequires
# match the requires versions of things).
@ -366,6 +369,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
%{_prefix}/libexec/anaconda/dd_*
%changelog
* Mon Sep 07 2020 Martin Kolman <mkolman@redhat.com> - 33.25.2-2
- Always clear treeinfo metadata (#1872056) (jkonecny)
* Fri Aug 21 2020 Martin Kolman <mkolman@redhat.com> - 33.25.2-1
- Fix dependency_solver failure with spec file boolean logic syntax (jkonecny)
- Avoid unnecessarily pulling in glibc-langpack-en (sgallagh)