Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

storage/file: gracefully handle not mounted pool

Browse Source 
Fixes QubesOS/qubes-issues#4668
This commit is contained in:
Marek Marczykowski-Górecki 2019-02-19 15:22:47 +01:00
parent 27a0fe25ab
commit 318ed439ff
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qubes/storage/file.py
View File

@ -155,13 +155,19 @@ class FilePool(qubes.storage.Pool):
@property @property
def size(self): def size(self):
try:
statvfs = os.statvfs(self.dir_path) statvfs = os.statvfs(self.dir_path)
return statvfs.f_frsize * statvfs.f_blocks return statvfs.f_frsize * statvfs.f_blocks
except FileNotFoundError:
return 0
@property @property
def usage(self): def usage(self):
try:
statvfs = os.statvfs(self.dir_path) statvfs = os.statvfs(self.dir_path)
return statvfs.f_frsize * (statvfs.f_blocks - statvfs.f_bfree) return statvfs.f_frsize * (statvfs.f_blocks - statvfs.f_bfree)
except FileNotFoundError:
return 0
def included_in(self, app): def included_in(self, app):
''' Check if there is pool containing this one - either as a ''' Check if there is pool containing this one - either as a