From 92f793ee9ba641966132836cd6af5133958ac7bd Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Mon, 14 Aug 2023 09:12:47 +1200 Subject: [PATCH] simplify partition_by_partuuid --- subiquity/models/filesystem.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/subiquity/models/filesystem.py b/subiquity/models/filesystem.py index 65611297..563ba9a3 100644 --- a/subiquity/models/filesystem.py +++ b/subiquity/models/filesystem.py @@ -1821,15 +1821,7 @@ class FilesystemModel(object): return self._all(type="lvm_volgroup") def partition_by_partuuid(self, partuuid: str) -> Optional[Partition]: - # This can be simplified when - # https://code.launchpad.net/~mwhudson/curtin/+git/curtin/+merge/448842 - # lands. - for part in self.app.base_model.filesystem._all(type="partition"): - if part._info is None: - continue - if part._info.raw.get("ID_PART_ENTRY_UUID") == partuuid: - return part - return None + return self._one(type="partition", uuid=partuuid) def _remove(self, obj): _remove_backlinks(obj)