summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/live/ogOperations.py2
-rw-r--r--src/live/parttypes.py2
-rw-r--r--src/log.py2
-rw-r--r--src/ogRest.py2
-rw-r--r--src/utils/boot.py2
-rw-r--r--src/utils/hw_inventory.py6
-rw-r--r--src/utils/legacy.py2
7 files changed, 9 insertions, 9 deletions
diff --git a/src/live/ogOperations.py b/src/live/ogOperations.py
index d3b9d58..af9bd25 100644
--- a/src/live/ogOperations.py
+++ b/src/live/ogOperations.py
@@ -270,7 +270,7 @@ class OgLiveOperations:
if not mount_mkdir(partdev, mountpoint):
raise RuntimeError(f'Error mounting {partdev} at {mountpoint}')
if not os.path.ismount(mountpoint):
- raise RuntimeError('Invalid mountpoint for software inventory')
+ raise RuntimeError(f'Invalid mountpoint {mountpoint} for software inventory')
self._restartBrowser(self._url_log)
pkgset = get_package_set(mountpoint)
diff --git a/src/live/parttypes.py b/src/live/parttypes.py
index 21729a3..b4c1793 100644
--- a/src/live/parttypes.py
+++ b/src/live/parttypes.py
@@ -54,4 +54,4 @@ def get_parttype(cxt, ptype_str):
elif cxt.label.name == 'gpt':
return get_gpt_parttype(cxt, ptype_str)
else:
- raise RuntimeError('BUG: Invalid partition label')
+ raise RuntimeError(f'Invalid partition label \'{cxt.label.name}\'')
diff --git a/src/log.py b/src/log.py
index aaad319..0d86a16 100644
--- a/src/log.py
+++ b/src/log.py
@@ -125,7 +125,7 @@ def configure_logging(mode, level):
elif mode == 'live':
logconfig = _default_logging_live()
else:
- raise ValueError(f'Error: Mode {mode} not supported')
+ raise ValueError(f'Logging mode {mode} not supported')
logconfig['loggers']['']['level'] = level
diff --git a/src/ogRest.py b/src/ogRest.py
index 47767b6..c7bdcdb 100644
--- a/src/ogRest.py
+++ b/src/ogRest.py
@@ -263,7 +263,7 @@ class ogRest():
from src.windows.ogOperations import OgWindowsOperations
self.operations = OgWindowsOperations()
else:
- raise ValueError('Mode not supported.')
+ raise ValueError(f'Ogrest mode \'{self.mode}\'not supported')
def send_internal_server_error(self, client, exc=None):
if isinstance(exc, AssertionError):
diff --git a/src/utils/boot.py b/src/utils/boot.py
index 528c052..04cae8e 100644
--- a/src/utils/boot.py
+++ b/src/utils/boot.py
@@ -130,6 +130,6 @@ def boot_os_at(disk, part):
elif not is_uefi and os_family == OSFamily.LINUX:
_boot_bios_linux(disk, part, mountpoint)
else:
- raise RuntimeError('Unknown OS family')
+ raise RuntimeError(f'Unknown OS family {os_family}')
finally:
umount(mountpoint)
diff --git a/src/utils/hw_inventory.py b/src/utils/hw_inventory.py
index 23c8765..c534101 100644
--- a/src/utils/hw_inventory.py
+++ b/src/utils/hw_inventory.py
@@ -55,7 +55,7 @@ class HardwareInventory():
def add_element(self, elem):
if elem.type not in HardwareType:
- raise ValueError('Unsupported hardware type')
+ raise ValueError(f'Unsupported hardware type, received {elem.type}')
if not elem.name:
raise ValueError('Empty hardware element name')
self.elements.append(elem)
@@ -250,7 +250,7 @@ def legacy_hardware_element(element):
represented as "vga=Foo"
"""
if type(element) is not HardwareElement:
- raise TypeError('Invalid type')
+ raise TypeError('Invalid hardware element type')
elif element.type is HardwareType.MULTIMEDIA:
nemonic = 'mul'
elif element.type is HardwareType.BOOTMODE:
@@ -297,7 +297,7 @@ def get_hardware_inventory():
if type(j) is list:
root = j[0]
if type(root) is not dict:
- raise ValueError('Unvalid lshw json output')
+ raise ValueError('Invalid lshw json output')
inventory = HardwareInventory()
_fill_computer_model(inventory, root)
diff --git a/src/utils/legacy.py b/src/utils/legacy.py
index d3a0318..76fc6c6 100644
--- a/src/utils/legacy.py
+++ b/src/utils/legacy.py
@@ -174,7 +174,7 @@ def ogChangeRepo(ip, smb_user='opengnsys', smb_pass='og'):
try:
ipaddr = ipaddress.ip_address(ip)
except ValueError as e:
- raise ValueError('Invalid ip address')
+ raise ValueError(f'Invalid IP address {ip} received')
mounted = False
with open('/etc/mtab') as f: