From 838010aecf6a850008990c07b306da794e79f880 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 8 Nov 2022 01:44:13 -0500
Subject: [PATCH] import leapp-0.15.0-2.el8

---
 .gitignore                                    |  2 +-
 .leapp.metadata                               |  2 +-
 ...ecks-for-missing-answers-more-strict.patch | 50 +++++++++++++++++++
 SPECS/leapp.spec                              | 23 +++++++--
 4 files changed, 71 insertions(+), 6 deletions(-)
 create mode 100644 SOURCES/0001-Make-checks-for-missing-answers-more-strict.patch

diff --git a/.gitignore b/.gitignore
index 96e3aea..ccb9518 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/leapp-0.14.0.tar.gz
+SOURCES/leapp-0.15.0.tar.gz
diff --git a/.leapp.metadata b/.leapp.metadata
index 3d2461c..ffac38a 100644
--- a/.leapp.metadata
+++ b/.leapp.metadata
@@ -1 +1 @@
-7112e8c641c99ad7edfa87de1d8614ff7c93b01e SOURCES/leapp-0.14.0.tar.gz
+36cdd3d8d957a500c8dfe8dfb90ecd8c1ef84737 SOURCES/leapp-0.15.0.tar.gz
diff --git a/SOURCES/0001-Make-checks-for-missing-answers-more-strict.patch b/SOURCES/0001-Make-checks-for-missing-answers-more-strict.patch
new file mode 100644
index 0000000..43345b8
--- /dev/null
+++ b/SOURCES/0001-Make-checks-for-missing-answers-more-strict.patch
@@ -0,0 +1,50 @@
+From 84de08e3fe25c7eadf5cbb2f18b83acf3536fc2a Mon Sep 17 00:00:00 2001
+From: Inessa Vasilevskaya <ivasilev@redhat.com>
+Date: Tue, 6 Sep 2022 15:26:52 +0200
+Subject: [PATCH] Make checks for missing answers more strict
+
+Previously only presence of one section in the answerfile
+has been verified, which led to false-positive preupgrade
+reports when some other key has been present in the
+dialog section instead of the required one.
+
+OAMG-7521
+---
+ leapp/messaging/__init__.py | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/leapp/messaging/__init__.py b/leapp/messaging/__init__.py
+index 1ecc42e..9896179 100644
+--- a/leapp/messaging/__init__.py
++++ b/leapp/messaging/__init__.py
+@@ -152,10 +152,17 @@ class BaseMessaging(object):
+         """
+         self._stop_after_phase.set(True)
+ 
++    def _unanswered_questions(self, dialog):
++        userchoices = dialog.get_answers(self._answers)
++        res = [s for s in dialog.answerfile_sections.keys() if s.split('.', 2)[1] not in userchoices]
++        return res
++
+     def register_dialog(self, dialog, actor):
++        # FIXME(ivasilev) Make sure it works correctly in case of a dialog with several questions. Currently there
++        # is no such dialog in actors but this code should be revisited if this changes. OAMG-7523
+         self._dialogs.append(dialog)
+-        userchoices = dialog.get_answers(self._answers)
+-        if not userchoices:
++        unanswered = self._unanswered_questions(dialog)
++        if unanswered:
+             # produce DialogModel messages for all the dialogs that don't have answers in answerfile
+             stable_key = dialog.key if dialog.key else hashlib.sha1(
+                 ','.join(sorted(dialog.answerfile_sections.keys())).encode('utf-8')).hexdigest()
+@@ -164,6 +171,7 @@ class BaseMessaging(object):
+                                      key=stable_key), actor)
+         else:
+             # update dialogs with answers from answerfile. That is necessary for proper answerfile generation
++            userchoices = dialog.get_answers(self._answers)
+             for component, value in userchoices.items():
+                 dialog_component = dialog.component_by_key(component)
+                 if dialog_component:
+-- 
+2.37.2
+
diff --git a/SPECS/leapp.spec b/SPECS/leapp.spec
index 056c92f..4a8885b 100644
--- a/SPECS/leapp.spec
+++ b/SPECS/leapp.spec
@@ -7,7 +7,7 @@
 # it. In case of upstream, dependencies are set differently, but YUM is not
 # capable enough to deal with them correctly all the time; we continue to use
 # simplified deps in RHEL to ensure that YUM can deal with it.
-%global framework_version 2.2
+%global framework_version 3.1
 
 # IMPORTANT: everytime the requirements are changed, increment number by one
 # - same for Provides in deps subpackage
@@ -36,8 +36,8 @@
 %endif
 
 Name:       leapp
-Version:    0.14.0
-Release:    1%{?dist}
+Version:    0.15.0
+Release:    2%{?dist}
 Summary:    OS & Application modernization framework
 
 License:    ASL 2.0
@@ -63,8 +63,9 @@ Requires: %{leapp_python_name}-%{name} = %{version}-%{release}
 Requires: leapp-repository
 %endif # !fedora
 
-# PATHES HERE
+# PATCHES HERE
 # Patch0001: filename.patch
+Patch0001:   0001-Make-checks-for-missing-answers-more-strict.patch
 
 
 %description
@@ -160,6 +161,7 @@ Requires: findutils
 
 # APPLY REGISTERED PATCHES HERE
 # %%patch0001 -p1
+%patch0001 -p1
 
 
 ##################################################
@@ -243,6 +245,19 @@ install -m 0644 -p man/leapp.1 %{buildroot}%{_mandir}/man1/
 # no files here
 
 %changelog
+* Thu Sep 08 2022 Petr Stodulka <pstodulk@redhat.com> - 0.15.0-2
+- Fix the check of missing required answers
+- Resolves: rhbz#2124332
+
+* Wed Aug 24 2022 Petr Stodulka <pstodulk@redhat.com> - 0.15.0-1
+- Rebase to v0.15.0
+- Bump leapp-framework to 3.1
+- Deprecate `reporting.(Tags|Flags)` replaced by `reporting.Groups`
+- Fix crashes when processing invalid FQDNs
+- Fix the error msg when a leapp CLI command does not exist
+- Introduce new report JSON schema v1.2.0 (default: 1.1.0)
+- Resolves: rhbz#2090992, rhbz#2106065
+
 * Mon Mar 14 2022 Petr Stodulka <pstodulk@redhat.com> - 0.14.0-1
 - Rebase to v0.14.0
 - Bump leapp-framework to 2.2