StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

filesystem: disk action match fail exception 

Move the exception raised by manual storage actions to AutoinstallError
This commit is contained in:
Dan Bungert 2024-03-12 18:40:30 -06:00
parent e6dde2e324
commit ab7391ee8a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
subiquity/models/filesystem.py
View File

@ -36,6 +36,7 @@ from curtin.util import human2bytes
from probert.storage import StorageInfo from probert.storage import StorageInfo
from subiquity.common.types import Bootloader, OsProber, RecoveryKey from subiquity.common.types import Bootloader, OsProber, RecoveryKey
from subiquity.server.autoinstall import AutoinstallError
from subiquitycore.utils import write_named_tempfile from subiquitycore.utils import write_named_tempfile
log = logging.getLogger("subiquity.models.filesystem") log = logging.getLogger("subiquity.models.filesystem")
@ -1722,9 +1723,9 @@ class FilesystemModel:
if disk is None: if disk is None:
action["match"] = match action["match"] = match
if disk is None: if disk is None:
raise Exception("{} matched no disk".format(action)) raise AutoinstallError("{} matched no disk".format(action))
if disk not in disks: if disk not in disks:
raise Exception( raise AutoinstallError(
"{} matched {} which was already used".format(action, disk) "{} matched {} which was already used".format(action, disk)
) )
disks.remove(disk) disks.remove(disk)