From 5698aa66d21f6c699a7170ea21c8d3ad0dc5a616 Mon Sep 17 00:00:00 2001 From: Alejandro Sirgo Rica Date: Mon, 3 Jun 2024 10:43:56 +0200 Subject: utils: fix get_image_info regression Fix image size, permissions and creation time. Improve error report related to these parameters now showing the exact cause of the problem if any occurred during the definition of image size, file permissions or image creation time values. --- src/live/ogOperations.py | 1 - src/utils/image.py | 11 ++++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/live/ogOperations.py b/src/live/ogOperations.py index 3eee06a..d98568f 100644 --- a/src/live/ogOperations.py +++ b/src/live/ogOperations.py @@ -10,7 +10,6 @@ import datetime import hashlib import logging import os -import stat import subprocess import shlex import shutil diff --git a/src/utils/image.py b/src/utils/image.py index a9ffb22..088c0c3 100644 --- a/src/utils/image.py +++ b/src/utils/image.py @@ -9,6 +9,7 @@ import ipaddress import logging import os +import stat import subprocess import shlex import shutil @@ -131,11 +132,11 @@ def get_image_info(image_path): try: st = os.stat(image_path) - self.size = st.st_size - self.perms = st.st_mode & (stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO) - self.mtime = int(st.st_mtime) - except: - logging.info(f'cannot retrieve stats from {image_path}') + image_info.size = st.st_size + image_info.perms = st.st_mode & (stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO) + image_info.mtime = int(st.st_mtime) + except Exception as e: + logging.info(f'cannot retrieve stats from {image_path}: {e}') return image_info -- cgit v1.2.3-18-g5258