narrowed down exception we ignore and fail if any other unexpected one

crops up.
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
pull/3602/head
Brian Coca 12 years ago
parent efaaaa6c79
commit b7b1c714f9

@ -626,27 +626,26 @@ class LinuxHardware(Hardware):
if line.startswith('/'): if line.startswith('/'):
fields = line.rstrip('\n').split() fields = line.rstrip('\n').split()
if(fields[2] != 'none'): if(fields[2] != 'none'):
size_total = None
size_available = None
try: try:
statvfs_result = os.statvfs(fields[1]) statvfs_result = os.statvfs(fields[1])
self.facts['mounts'].append( size_total = statvfs_result.f_bsize * statvfs_result.f_blocks
{'mount': fields[1], size_available = statvfs_result.f_bsize * (statvfs_result.f_bavail)
'device':fields[0],
'fstype': fields[2],
'options': fields[3],
# statvfs data
'size_total': statvfs_result.f_bsize * statvfs_result.f_blocks,
'size_available': statvfs_result.f_bsize * (statvfs_result.f_bavail),
})
except OSError, e: except OSError, e:
# don't have access to stat so we'll set to None if e.errno == errno.ENOENT:
pass
else:
self.fail_json(msg=e.strerror)
self.facts['mounts'].append( self.facts['mounts'].append(
{'mount': fields[1], {'mount': fields[1],
'device':fields[0], 'device':fields[0],
'fstype': fields[2], 'fstype': fields[2],
'options': fields[3], 'options': fields[3],
# statvfs data # statvfs data
'size_total': None, 'size_total': size_total,
'size_available': None, 'size_available': size_available,
}) })
def get_device_facts(self): def get_device_facts(self):

Loading…
Cancel
Save