import kdump-anaconda-addon-006-11.20211014git4c5a91d.el9

This commit is contained in:
CentOS Sources 2022-02-01 12:54:51 -05:00 committed by Stepan Oksanichenko
parent c4b28ceb36
commit 8117353f58
5 changed files with 38 additions and 9 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/kdump-anaconda-addon-641a7b7.tar.gz SOURCES/kdump-anaconda-addon-4c5a91d.tar.gz

View File

@ -1 +1 @@
1b5c4130b775abdc1a91d08324ddfae703a836e3 SOURCES/kdump-anaconda-addon-641a7b7.tar.gz 6e77cc95838067f6dfd4546e6b1fbd708690eaa6 SOURCES/kdump-anaconda-addon-4c5a91d.tar.gz

View File

@ -7,7 +7,7 @@ Signed-off-by: Kairui Song <kasong@redhat.com>
--- ---
com_redhat_kdump/service/kdump.py | 2 +- com_redhat_kdump/service/kdump.py | 2 +-
com_redhat_kdump/service/kickstart.py | 2 +- com_redhat_kdump/service/kickstart.py | 2 +-
test/unittests/test_kickstart.py | 4 ++-- test/unit_tests/test_kickstart.py | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-) 3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/com_redhat_kdump/service/kdump.py b/com_redhat_kdump/service/kdump.py diff --git a/com_redhat_kdump/service/kdump.py b/com_redhat_kdump/service/kdump.py
@ -36,14 +36,14 @@ index c2455a4..32c532f 100644
self.reserve_mb = "auto" self.reserve_mb = "auto"
self.enablefadump = False self.enablefadump = False
diff --git a/test/unittests/test_kickstart.py b/test/unittests/test_kickstart.py diff --git a/test/unit_tests/test_kickstart.py b/test/unit_tests/test_kickstart.py
index 49d73d2..f833504 100644 index 49d73d2..f833504 100644
--- a/test/unittests/test_kickstart.py --- a/test/unit_tests/test_kickstart.py
+++ b/test/unittests/test_kickstart.py +++ b/test/unit_tests/test_kickstart.py
@@ -26,12 +26,12 @@ class KdumpKickstartTestCase(TestCase): @@ -26,12 +26,12 @@ class KdumpKickstartTestCase(TestCase):
self.assertEqual(output.strip(), dedent(ks_out).strip()) self.assertEqual(output.strip(), dedent(ks_out).strip())
def ks_default_test(self): def test_ks_default(self):
- self.assertEqual(self._service.kdump_enabled, False) - self.assertEqual(self._service.kdump_enabled, False)
+ self.assertEqual(self._service.kdump_enabled, True) + self.assertEqual(self._service.kdump_enabled, True)
self.assertEqual(self._service.fadump_enabled, False) self.assertEqual(self._service.fadump_enabled, False)

View File

@ -0,0 +1,25 @@
From ecf5928a6ada13cbf06bae7860d176fd82520941 Mon Sep 17 00:00:00 2001
From: Coiby Xu <coiby.xu@gmail.com>
Date: Thu, 13 Jan 2022 15:21:27 +0800
Subject: [PATCH] Revert "Remove the helpFile attribute"
This reverts commit 3afe9e0c6fa55b10f0ade7cb780387fe4cc498cb.
---
com_redhat_kdump/gui/spokes/kdump.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/com_redhat_kdump/gui/spokes/kdump.py b/com_redhat_kdump/gui/spokes/kdump.py
index 2b759d6..53daa64 100644
--- a/com_redhat_kdump/gui/spokes/kdump.py
+++ b/com_redhat_kdump/gui/spokes/kdump.py
@@ -45,6 +45,7 @@ class KdumpSpoke(NormalSpoke):
builderObjects = ["KdumpWindow", "advancedConfigBuffer"]
mainWidgetName = "KdumpWindow"
uiFile = "kdump.glade"
+ helpFile = "KdumpSpoke.xml"
translationDomain = "kdump-anaconda-addon"
icon = "kdump"
--
2.31.1

View File

@ -1,10 +1,10 @@
%global gitcommit 641a7b75c71eb080ce0a5d8bf03b94dbcb1ec6b6 %global gitcommit 4c5a91d40bd4ad6080ff831788409abb73a25b3e
%global gitshortcommit %(c=%{gitcommit}; echo ${c:0:7}) %global gitshortcommit %(c=%{gitcommit}; echo ${c:0:7})
%global snapshotdate 20211014 %global snapshotdate 20211014
Name: kdump-anaconda-addon Name: kdump-anaconda-addon
Version: 006 Version: 006
Release: 10.%{snapshotdate}git%{gitshortcommit}%{?dist} Release: 11.%{snapshotdate}git%{gitshortcommit}%{?dist}
Url: https://github.com/daveyoung/kdump-anaconda-addon Url: https://github.com/daveyoung/kdump-anaconda-addon
License: GPLv2 License: GPLv2
Summary: Kdump configuration anaconda addon Summary: Kdump configuration anaconda addon
@ -21,6 +21,7 @@ Source0: https://github.com/daveyoung/kdump-anaconda-addon/archive/%{gitcommit}/
Patch1: 0001.patch Patch1: 0001.patch
Patch2: 0002.patch Patch2: 0002.patch
Patch3: 0003-Revert-Remove-the-helpFile-attribute.patch
%description %description
Kdump anaconda addon Kdump anaconda addon
@ -44,6 +45,9 @@ Kdump anaconda addon
%{_datadir}/icons/hicolor/scalable/apps/kdump.svg %{_datadir}/icons/hicolor/scalable/apps/kdump.svg
%changelog %changelog
* Thu Jan 13 2022 Coiby <coxu@redhat.com> - 006-1.20220113git4c5a91d
- Update to latest git snapshot (20220113). Resolves: bz2034491
* Thu Oct 14 2021 Kairui Song <kasong@redhat.com> - 006-10.20211014git641a7b7 * Thu Oct 14 2021 Kairui Song <kasong@redhat.com> - 006-10.20211014git641a7b7
- Update to latest git snapshot, update encryption warning message. Resolves: bz1999662 - Update to latest git snapshot, update encryption warning message. Resolves: bz1999662