import new BlockDev

anaconda.spec

@@ -1,7 +1,7 @@
 %define _empty_manifest_terminate_build 0
 Name:    anaconda
 Version: 36.16.5
-Release: 26
+Release: 27
 Summary: Graphical system installer
 License: GPLv2+ and MIT
 URL:     http://fedoraproject.org/wiki/Anaconda
@@ -55,8 +55,8 @@ Patch6008:    backport-module-setup.sh-Don-t-ignore-errors-unbound-variable-and-
 Patch6009:    backport-Fix-the-systemd-generator-for-systemd-253-2165433.patch
 
 Patch9023:    bugfix-change-root-and-storage-interface-shows.patch
-
 Patch9024:    bugfix-revert-Set-default-entry-to-the-BLS-id-instead-of-the-entry-index.patch
+Patch9025:    bugfix-import-new-BlockDev.patch
 
 %define dasbusver 1.3
 %define dbusver 1.2.3
@@ -311,6 +311,12 @@ update-desktop-database &> /dev/null || :
 %{_prefix}/libexec/anaconda/dd_*
 
 %changelog
+* Wed Feb 28 2023 sunhai <sunhai10@huawei.com> - 36.16.5-27
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC: import new  BlockDev
+
 * Sat Dec 23 2023 sunhai <sunhai10@huawei.com> - 36.16.5-26
 - Type:bugfix
 - ID:NA

bugfix-import-new-BlockDev.patch

@@ -0,0 +1,123 @@
+From 765938409daeeacf1faf3c2695c68a85f0b30b4d Mon Sep 17 00:00:00 2001
+From: s30028044 <sunhai10@huawei.com>
+Date: Wed, 28 Feb 2024 11:33:54 +0800
+Subject: [PATCH] import new  BlockDev
+
+---
+ pyanaconda/modules/storage/checker/utils.py    | 2 +-
+ pyanaconda/modules/storage/dasd/discover.py    | 2 +-
+ pyanaconda/modules/storage/dasd/format.py      | 2 +-
+ pyanaconda/modules/storage/devicetree/fsset.py | 2 +-
+ pyanaconda/modules/storage/initialization.py   | 2 +-
+ pyanaconda/modules/storage/installation.py     | 2 +-
+ pyanaconda/modules/storage/nvdimm/nvdimm.py    | 2 +-
+ pyanaconda/modules/storage/zfcp/discover.py    | 2 +-
+ 8 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/pyanaconda/modules/storage/checker/utils.py b/pyanaconda/modules/storage/checker/utils.py
+index 9ccd398..74aedae 100644
+--- a/pyanaconda/modules/storage/checker/utils.py
++++ b/pyanaconda/modules/storage/checker/utils.py
+@@ -16,7 +16,7 @@
+ # Red Hat, Inc.
+ #
+ import gi
+-gi.require_version("BlockDev", "2.0")
++gi.require_version("BlockDev", "3.0")
+ from gi.repository import BlockDev as blockdev
+ 
+ from collections import defaultdict
+diff --git a/pyanaconda/modules/storage/dasd/discover.py b/pyanaconda/modules/storage/dasd/discover.py
+index 06e3b39..d1de38e 100644
+--- a/pyanaconda/modules/storage/dasd/discover.py
++++ b/pyanaconda/modules/storage/dasd/discover.py
+@@ -18,7 +18,7 @@
+ # Red Hat, Inc.
+ #
+ import gi
+-gi.require_version("BlockDev", "2.0")
++gi.require_version("BlockDev", "3.0")
+ from gi.repository import BlockDev as blockdev
+ 
+ from pyanaconda.core.regexes import DASD_DEVICE_NUMBER
+diff --git a/pyanaconda/modules/storage/dasd/format.py b/pyanaconda/modules/storage/dasd/format.py
+index 7ae389b..48d5c46 100644
+--- a/pyanaconda/modules/storage/dasd/format.py
++++ b/pyanaconda/modules/storage/dasd/format.py
+@@ -21,7 +21,7 @@ from pyanaconda.modules.common.task import Task
+ from pyanaconda.anaconda_loggers import get_module_logger
+ 
+ import gi
+-gi.require_version("BlockDev", "2.0")
++gi.require_version("BlockDev", "3.0")
+ from gi.repository import BlockDev as blockdev
+ 
+ log = get_module_logger(__name__)
+diff --git a/pyanaconda/modules/storage/devicetree/fsset.py b/pyanaconda/modules/storage/devicetree/fsset.py
+index 0d151d3..4db3759 100644
+--- a/pyanaconda/modules/storage/devicetree/fsset.py
++++ b/pyanaconda/modules/storage/devicetree/fsset.py
+@@ -20,7 +20,7 @@ import shutil
+ import time
+ 
+ import gi
+-gi.require_version("BlockDev", "2.0")
++gi.require_version("BlockDev", "3.0")
+ from gi.repository import BlockDev as blockdev
+ 
+ from blivet.devices import NoDevice, DirectoryDevice, NFSDevice, FileDevice, MDRaidArrayDevice, \
+diff --git a/pyanaconda/modules/storage/initialization.py b/pyanaconda/modules/storage/initialization.py
+index bb5ad24..17b8274 100644
+--- a/pyanaconda/modules/storage/initialization.py
++++ b/pyanaconda/modules/storage/initialization.py
+@@ -26,7 +26,7 @@ from pyanaconda.anaconda_logging import program_log_lock
+ from pyanaconda.core.configuration.anaconda import conf
+ 
+ import gi
+-gi.require_version("BlockDev", "2.0")
++gi.require_version("BlockDev", "3.0")
+ from gi.repository import BlockDev as blockdev
+ 
+ __all__ = ["enable_installer_mode"]
+diff --git a/pyanaconda/modules/storage/installation.py b/pyanaconda/modules/storage/installation.py
+index 05d91f3..8f82734 100644
+--- a/pyanaconda/modules/storage/installation.py
++++ b/pyanaconda/modules/storage/installation.py
+@@ -36,7 +36,7 @@ from pyanaconda.modules.common.errors.installation import StorageInstallationErr
+ from pyanaconda.modules.common.task import Task
+ 
+ import gi
+-gi.require_version("BlockDev", "2.0")
++gi.require_version("BlockDev", "3.0")
+ from gi.repository import BlockDev as blockdev
+ 
+ log = get_module_logger(__name__)
+diff --git a/pyanaconda/modules/storage/nvdimm/nvdimm.py b/pyanaconda/modules/storage/nvdimm/nvdimm.py
+index f9aef8b..1aa6295 100644
+--- a/pyanaconda/modules/storage/nvdimm/nvdimm.py
++++ b/pyanaconda/modules/storage/nvdimm/nvdimm.py
+@@ -32,7 +32,7 @@ from pyanaconda.modules.storage.nvdimm.nvdimm_interface import NVDIMMInterface
+ from pyanaconda.modules.storage.nvdimm.reconfigure import NVDIMMReconfigureTask
+ 
+ import gi
+-gi.require_version("BlockDev", "2.0")
++gi.require_version("BlockDev", "3.0")
+ from gi.repository import BlockDev as blockdev
+ 
+ log = get_module_logger(__name__)
+diff --git a/pyanaconda/modules/storage/zfcp/discover.py b/pyanaconda/modules/storage/zfcp/discover.py
+index 231e097..796f7c5 100644
+--- a/pyanaconda/modules/storage/zfcp/discover.py
++++ b/pyanaconda/modules/storage/zfcp/discover.py
+@@ -18,7 +18,7 @@
+ # Red Hat, Inc.
+ #
+ import gi
+-gi.require_version("BlockDev", "2.0")
++gi.require_version("BlockDev", "3.0")
+ from gi.repository import BlockDev as blockdev
+ 
+ from blivet.zfcp import zfcp
+-- 
+2.27.0
+