File tree Expand file tree Collapse file tree 1 file changed +7
-3
lines changed Expand file tree Collapse file tree 1 file changed +7
-3
lines changed Original file line number Diff line number Diff line change 11__author__ = 'desultory'
2- __version__ = '4.15.3 '
2+ __version__ = '4.15.4 '
33
44from pathlib import Path
55from zenlib .util import contains , pretty_print
@@ -277,12 +277,16 @@ def get_dm_info(self) -> dict:
277277 for dm_device in (Path ('/sys/devices/virtual/block' ).iterdir ()):
278278 if dm_device .name .startswith ('dm-' ) or dm_device .name .startswith ('md' ):
279279 maj , minor = (dm_device / 'dev' ).read_text ().strip ().split (':' )
280- self ['_dm_info' ][dm_device .name ] = {'name' : (dm_device / 'dm/name' ).read_text ().strip (),
281- 'major' : maj ,
280+ self ['_dm_info' ][dm_device .name ] = {'major' : maj ,
282281 'minor' : minor ,
283282 'holders' : [holder .name for holder in (dm_device / 'holders' ).iterdir ()],
284283 'slaves' : [slave .name for slave in (dm_device / 'slaves' ).iterdir ()],
285284 'uuid' : (dm_device / 'dm/uuid' ).read_text ().strip ()}
285+ try :
286+ self ['_dm_info' ][dm_device .name ]['name' ] = (dm_device / 'dm/name' ).read_text ().strip ()
287+ except FileNotFoundError :
288+ self .logger .warning ("No device mapper name found for: %s" % dm_device .name )
289+
286290 if self ['_dm_info' ]:
287291 self .logger .info ("Found device mapper devices: %s" % ', ' .join (self ['_dm_info' ].keys ()))
288292 self .logger .debug ("Device mapper info: %s" % pretty_print (self ['_dm_info' ]))
You can’t perform that action at this time.
0 commit comments