nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-07-22 11:59:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

storage: Fix parsing issues when mount point has spaces

Browse Source 
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Sunil Mohan Adapa 2018-07-19 18:26:13 -07:00 committed by James Valleroy
parent 5dc2ad1fa4
commit 4184784988
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plinth/modules/storage/__init__.py
View File

@ -68,7 +68,7 @@ def _get_disks_from_df():
"""Return the list of disks and free space available using 'df'."""
command = [
'df', '--exclude-type=tmpfs', '--exclude-type=devtmpfs',
'--block-size=1', '--output=source,target,fstype,size,used,avail,pcent'
'--block-size=1', '--output=source,fstype,size,used,avail,pcent,target'
]
try:
process = subprocess.run(command, stdout=subprocess.PIPE, check=True)
@ -80,9 +80,9 @@ def _get_disks_from_df():
disks = []
for line in output.splitlines()[1:]:
parts = line.split()
keys = ('device', 'mount_point', 'file_system_type', 'size', 'used',
'free', 'percent_used')
parts = line.split(maxsplit=6)
keys = ('device', 'file_system_type', 'size', 'used',
'free', 'percent_used', 'mount_point')
disk = dict(zip(keys, parts))
disk['percent_used'] = int(disk['percent_used'].rstrip('%'))
disk['size'] = int(disk['size'])