Skip to content

Commit 814b84b

Browse files
committed
don't raise an exception on missing uuid
Signed-off-by: Zen <[email protected]>
1 parent 8551731 commit 814b84b

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

src/ugrd/fs/mounts.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
__author__ = 'desultory'
2-
__version__ = '4.15.6'
2+
__version__ = '4.15.7'
33

44
from pathlib import Path
55
from zenlib.util import contains, pretty_print
@@ -280,12 +280,11 @@ def get_virtual_block_info(self) -> dict:
280280
self['_dm_info'][virt_device.name] = {'major': maj,
281281
'minor': minor,
282282
'holders': [holder.name for holder in (virt_device / 'holders').iterdir()],
283-
'slaves': [slave.name for slave in (virt_device / 'slaves').iterdir()],
284-
'uuid': (virt_device / 'dm/uuid').read_text().strip()}
283+
'slaves': [slave.name for slave in (virt_device / 'slaves').iterdir()]}
285284
if (virt_device / 'dm').exists():
286-
self['_dm_info'][virt_device.name]['name'] = (virt_device / 'dm/name').read_text().strip()
285+
self['_dm_info'][virt_device.name]['uuid'] = (virt_device / 'dm/uuid').read_text().strip()
287286
elif (virt_device / 'md').exists():
288-
self['_dm_info'][virt_device.name]['name'] = (virt_device / 'md/name').read_text().strip()
287+
self['_dm_info'][virt_device.name]['uuid'] = (virt_device / 'md/uuid').read_text().strip()
289288
else:
290289
raise ValueError("Failed to get virtual device name: %s" % virt_device.name)
291290

0 commit comments

Comments
 (0)