mirror of
https://abf.rosa.ru/djam/livecd-tools.git
synced 2025-02-24 16:13:01 +00:00
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
|
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
|
||
|
|
|