Modernize detection of checkisomd5

This commit is contained in:
Mikhail Novosyolov 2021-06-27 22:34:15 +03:00
parent 397e2d86d5
commit 9715e03f33
3 changed files with 39 additions and 2 deletions

View file

@ -0,0 +1,35 @@
From 1866d751aef7cde30a350340be83569277df328c Mon Sep 17 00:00:00 2001
From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
Date: Sun, 27 Jun 2021 22:29:31 +0300
Subject: [PATCH] Modernize detection of checkisomd5
I do not know what /usr/lib/anaconda-runtime/checkisomd5 is and when it existed,
it does not exist in modern Anaconda
chrootentitycheck() prints error message when it tries to find not existing binary
and then does not print anything when the second variant is found. It is confusing.
---
imgcreate/live.py | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/imgcreate/live.py b/imgcreate/live.py
index 7577895..d00918a 100644
--- a/imgcreate/live.py
+++ b/imgcreate/live.py
@@ -134,12 +134,7 @@ class LiveImageCreatorBase(LoopImageCreator):
#
def _has_checkisomd5(self):
"""Check whether checkisomd5 is available in the install root."""
- for c in '/usr/lib/anaconda-runtime/checkisomd5', 'checkisomd5':
- if chrootentitycheck(c, self._instroot):
- return True
- break
- else:
- return False
+ return chrootentitycheck('checkisomd5', self._instroot)
#
# Actual implementation
--
2.31.1

View file

@ -10,7 +10,7 @@ Name: livecd-tools
Summary: Tools for building live CDs
Epoch: 1
Version: 28.2
Release: 4
Release: 5
License: GPLv2
Group: System/Base
URL: https://github.com/livecd-tools/livecd-tools
@ -35,7 +35,9 @@ Patch0009: 0009-Fix-check-if-EFI-bootloader-exists.patch
Patch0010: 0010-mkdir-isolinux-on-aarch64.patch
# https://github.com/livecd-tools/livecd-tools/pull/197
Patch0011: 0011-Fix-missync-of-locations-of-efiboot.img.patch
Patch0012: 0012-ROSA-theme-and-config-of-bootloaders.patch
# https://github.com/livecd-tools/livecd-tools/pull/199
Patch0012: 0012-Modernize-detection-of-checkisomd5.patch
Patch0013: 0013-ROSA-theme-and-config-of-bootloaders.patch
BuildRequires: python3-devel
# pod2man comes from perl