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

upgrades: Only check free space bytes before dist upgrade

Browse Source 
Remove the percentage check, which was incorrectly checking used
percent, not free percent.

Closes: #2046.

Tests:

- Fill up disk space so that 4.5G is free. Dist upgrade does not start
  due to not enough free space.

- Fill up disk space so that 5.5G is free. Dist upgrade can be
  started.

Signed-off-by: James Valleroy <jvalleroy@mailbox.org>
Reviewed-by: Sunil Mohan Adapa <sunil@medhas.org>
This commit is contained in:
James Valleroy 2021-02-09 19:42:22 -05:00
parent f978d2f0d0
commit f83c763ab7
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
actions/upgrades
View File

@ -366,10 +366,9 @@ def _check_dist_upgrade(test_upgrade=False):
if check_dist == 'testing' and not test_upgrade:
return (False, 'test-not-set')
output = subprocess.check_output(['df', '--output=avail,pcent', '/'])
output = output.decode().split('\n')[1].split()
free_space, free_percent = int(output[0]), int(output[1][:-1])
if free_space < 5000000 or free_percent < 10:
output = subprocess.check_output(['df', '--output=avail', '/'])
free_space = int(output.decode().split('\n')[1])
if free_space < 5000000:
return (False, 'not-enough-free-space')
logging.info('Upgrading from %s to %s...', dist, codename)

7
plinth/modules/upgrades/__init__.py
View File

@ -209,11 +209,10 @@ def check_dist_upgrade(_):
logger.warning('Skip dist upgrade: Not enough free space in /.')
title = ugettext_noop('Could not start distribution update')
message = ugettext_noop(
# xgettext:no-python-format
'There is not enough free space in the root partition to '
'start the distribution update. Please ensure at least 5 GB, '
'and at least 10% of the total space, is free. Distribution '
'update will be retried after 24 hours, if enabled.')
'start the distribution update. Please ensure at least 5 GB '
'is free. Distribution update will be retried after 24 hours,'
' if enabled.')
Notification.update_or_create(
id='upgrades-dist-upgrade-free-space', app_id='upgrades',
severity='warning', title=title, message=message, actions=[{