Merge branch 'master' into develop

This commit is contained in:
JackDandy 2018-02-07 16:04:23 +00:00
commit 875530ce5a
2 changed files with 10 additions and 2 deletions

View file

@ -99,6 +99,11 @@
* Change removed NZBGet 'remote' PostProcess guidance until it is verified to work
### 0.14.2 (2018-02-07 16:00:00 UTC)
Change add handling for where requesting disk freespace is denied permission on some Linux distros
### 0.14.1 (2018-02-03 22:40:00 UTC)
Change terminology around the custom quality selection to improve clarity

View file

@ -1611,7 +1611,10 @@ def freespace(path=None):
except(StandardError, Exception):
pass
elif sys.platform.startswith(('linux', 'darwin', 'sunos5')) or 'bsd' in sys.platform:
storage = os.statvfs(path)
result = storage.f_bavail * storage.f_frsize
try:
storage = os.statvfs(path) # perms errors can result
result = storage.f_bavail * storage.f_frsize
except OSError:
pass
return result