openstack/glance
Code Issues Proposed changes

Merge "Use df(1) in a portable way"

Browse Source
This commit is contained in:
Jenkins
2014-06-19 18:00:19 +00:00
committed by Gerrit Code Review
parent 35b8068934 c8e2c8f020
commit 2dc8dbcfa1
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glance/store/filesystem.py
+3 -2
View File
@@ -30,6 +30,7 @@ from glance.openstack.common import excutils
from glance.openstack.common import jsonutils
import glance.openstack.common.log as logging
from glance.openstack.common import processutils
from glance.openstack.common import units
import glance.store
import glance.store.base
import glance.store.location
@@ -355,9 +356,9 @@ class Store(glance.store.base.Store):
"""
#Calculate total available space
df = processutils.execute("df", "--block-size=1",
df = processutils.execute("df", "-k",
mount_point)[0].strip("'\n'")
total_available_space = int(df.split('\n')[1].split()[3])
total_available_space = int(df.split('\n')[1].split()[3]) * units.Ki
return max(0, total_available_space)