From c38a874ee43dcf497fc07444c998449800426a94 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Wed, 9 Oct 2024 15:00:53 +0000 Subject: [PATCH] ceph-volume: address mypy errors in disk.py typical error: ``` ceph_volume/util/disk.py:1374: error: Incompatible types in assignment (expression has type "Optional[str]", variable has type "str") [assignment] ``` This commits addresses it. Signed-off-by: Guillaume Abrioux (cherry picked from commit b5e7008d28a5acd63ea9cd0c6b27f400dad409af) --- src/ceph-volume/ceph_volume/util/disk.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ceph-volume/ceph_volume/util/disk.py b/src/ceph-volume/ceph_volume/util/disk.py index c3afc12c083e4..c61c5060b5721 100644 --- a/src/ceph-volume/ceph_volume/util/disk.py +++ b/src/ceph-volume/ceph_volume/util/disk.py @@ -1371,8 +1371,8 @@ class UdevData: """ result: str = self.path if self.is_lvm: - vg: str = self.environment.get('DM_VG_NAME') - lv: str = self.environment.get('DM_LV_NAME') + vg: str = self.environment.get('DM_VG_NAME', '') + lv: str = self.environment.get('DM_LV_NAME', '') result = f'/dev/{vg}/{lv}' return result @@ -1386,6 +1386,6 @@ class UdevData: """ result: str = self.path if self.is_lvm: - name: str = self.environment.get('DM_NAME') + name: str = self.environment.get('DM_NAME', '') result = f'/dev/mapper/{name}' return result -- 2.39.5