48k.eu-mirror
/
ogclient
mirror of https://git.48k.eu/ogclient
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

utils: handle missing file in getlinuxversion function 

The function getlinuxversion receives a path to the os-release
file. The case of not being able to open it was not handled and
thus causing an unwanted exception.
master
Alejandro Sirgo Rica 2024-03-06 21:38:27 +01:00 committed by lupoDharkael
parent aa34704b4d
commit 9970c8e33d
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/utils/probe.py
View File

@ -9,6 +9,7 @@
import os import os
import subprocess import subprocess
import platform import platform
import logging
from enum import Enum from enum import Enum
from subprocess import PIPE from subprocess import PIPE
@ -25,6 +26,7 @@ def getlinuxversion(osrelease):
""" """
mountpoint = find_mountpoint(osrelease) mountpoint = find_mountpoint(osrelease)
try:
with open(osrelease, 'r') as f: with open(osrelease, 'r') as f:
for line in f: for line in f:
if line.find('=') == -1: if line.find('=') == -1:
@ -35,6 +37,8 @@ def getlinuxversion(osrelease):
value = value.strip('"') value = value.strip('"')
bits = ' 64 bits' if linux_is64bit(mountpoint) else '' bits = ' 64 bits' if linux_is64bit(mountpoint) else ''
return f'{value}{bits}' return f'{value}{bits}'
except FileNotFoundError as e:
logging.error(f'os-release file not found at "{osrelease}"')
return 'Linux' return 'Linux'