From 16e4742f7098f8896d7c87410e04ed90da52c02b Mon Sep 17 00:00:00 2001 From: mgb01105731 Date: Fri, 12 Dec 2025 17:38:28 +0800 Subject: [PATCH] Add patch to fix Duplicate UUID err --- 0013-fix-compare-uuid-fail.patch | 22 ++++++++++++++++++++++ python-blivet.spec | 7 ++++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 0013-fix-compare-uuid-fail.patch diff --git a/0013-fix-compare-uuid-fail.patch b/0013-fix-compare-uuid-fail.patch new file mode 100644 index 0000000..0b89474 --- /dev/null +++ b/0013-fix-compare-uuid-fail.patch @@ -0,0 +1,22 @@ +From e19d8109a70625e815f9d1428629a41d6c4d7f06 Mon Sep 17 00:00:00 2001 +From: iasunsea +Date: Sat, 25 May 2024 16:00:27 +0800 +Subject: [PATCH] fix compare uuid fail + +--- + blivet/populator/helpers/disk.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/blivet/populator/helpers/disk.py b/blivet/populator/helpers/disk.py +index 3ac3f4089..aa10c8693 100644 +--- a/blivet/populator/helpers/disk.py ++++ b/blivet/populator/helpers/disk.py +@@ -262,7 +262,7 @@ def _get_kwargs(self): + kwargs["eui64"] = ninfo.eui64 + kwargs["nguid"] = ninfo.nguid + +- if ninfo.uuid and ninfo.uuid != uuid.UUID(int=0): ++ if ninfo.uuid and str(ninfo.uuid) != str(uuid.UUID(int=0)): + kwargs["uuid"] = ninfo.uuid + else: + kwargs["uuid"] = None diff --git a/python-blivet.spec b/python-blivet.spec index 39ed3ef..15cd0ec 100644 --- a/python-blivet.spec +++ b/python-blivet.spec @@ -1,4 +1,4 @@ -%define anolis_release 2 +%define anolis_release 3 Summary: A python module for system storage configuration Name: python-blivet Url: https://storageapis.wordpress.com/projects/blivet @@ -23,6 +23,8 @@ Patch6: 0009-mod_pass_in_stratis_test.patch Patch7: 0010-Fix_running_tests_in_FIPS_mode.patch Patch8: 0011-Make-GPT-default-label-type-on-all-architectures.patch Patch9: 0012-Add-sw_64-support.patch +#https://github.com/storaged-project/blivet/pull/1237/commits/e19d8109a70625e815f9d1428629a41d6c4d7f06 +Patch10: 0013-fix-compare-uuid-fail.patch # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). @@ -130,6 +132,9 @@ make PYTHON=%{__python3} DESTDIR=%{buildroot} install %doc README.md ChangeLog examples %changelog +* Fri Dec 12 2025 mgb01105731 - 3.10.0-3 +- Add patch to fix Duplicate UUID err + * Mon Mar 31 2025 fenghui - 3.10.0-2 - arch: Support sw_64 arch -- Gitee