live: validate checksum only once if image is already in cache

if image already exists in the cache, skip a second checksum validation.

log shows duplicated entries:

	Verifying checksum for example.img, please wait...
	Checksum is OK for example.img
	Verifying checksum for example.img, please wait...
	Checksum is OK for example.img

because tip_check_csum() is called twice in this case.
master
OpenGnSys Support Team 2024-07-30 16:15:20 +02:00
parent 1376b1900d
commit 1329c0955b
1 changed files with 15 additions and 10 deletions

View File

@ -212,11 +212,13 @@ class OgLiveOperations:
if not get_cache_dev_path(): if not get_cache_dev_path():
raise OgError('No cache partition is mounted') raise OgError('No cache partition is mounted')
fetch = False
image_path = f'{OG_CACHE_IMAGE_PATH}{name}.img' image_path = f'{OG_CACHE_IMAGE_PATH}{name}.img'
if (not os.path.exists(image_path) or if (not os.path.exists(image_path) or not tip_check_csum(repo, name)):
not tip_check_csum(repo, name)):
self._copy_image_to_cache(name) self._copy_image_to_cache(name)
fetch = True
if fetch:
if (not os.path.exists(image_path)): if (not os.path.exists(image_path)):
raise OgError(f'could not find {image_path} in cache') raise OgError(f'could not find {image_path} in cache')
if (not tip_check_csum(repo, name)): if (not tip_check_csum(repo, name)):
@ -234,14 +236,17 @@ class OgLiveOperations:
if not get_cache_dev_path(): if not get_cache_dev_path():
raise OgError('No cache partition is mounted') raise OgError('No cache partition is mounted')
fetch = False
image_path = f'{OG_CACHE_IMAGE_PATH}{name}.img' image_path = f'{OG_CACHE_IMAGE_PATH}{name}.img'
try: try:
if (not os.path.exists(image_path) or not tip_check_csum(repo, name)): if (not os.path.exists(image_path) or not tip_check_csum(repo, name)):
tip_client_get(repo, name) tip_client_get(repo, name)
fetch = True
except: except:
self._restartBrowser(self._url) self._restartBrowser(self._url)
raise raise
if fetch:
if (not os.path.exists(image_path)): if (not os.path.exists(image_path)):
raise OgError(f'could not find {image_path} in cache') raise OgError(f'could not find {image_path} in cache')
if (not tip_check_csum(repo, name)): if (not tip_check_csum(repo, name)):