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

upgrades: Extend function to check for normal dist availability

Browse Source 
Signed-off-by: James Valleroy <jvalleroy@mailbox.org>
Reviewed-by: Sunil Mohan Adapa <sunil@medhas.org>
This commit is contained in:
James Valleroy 2020-08-19 20:38:24 -04:00 committed by Sunil Mohan Adapa
parent 819520466a
commit 036f917efb
No known key found for this signature in database
GPG Key ID: 43EA1CFF0AA7C5F2
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
actions/upgrades
View File

@ -19,8 +19,8 @@ from plinth.modules.upgrades import (get_current_release, is_backports_current,
AUTO_CONF_FILE = '/etc/apt/apt.conf.d/20auto-upgrades' AUTO_CONF_FILE = '/etc/apt/apt.conf.d/20auto-upgrades'
LOG_FILE = '/var/log/unattended-upgrades/unattended-upgrades.log' LOG_FILE = '/var/log/unattended-upgrades/unattended-upgrades.log'
DPKG_LOG_FILE = '/var/log/unattended-upgrades/unattended-upgrades-dpkg.log' DPKG_LOG_FILE = '/var/log/unattended-upgrades/unattended-upgrades-dpkg.log'
BACKPORTS_RELEASE_FILE_URL = \ RELEASE_FILE_URL = \
'https://deb.debian.org/debian/dists/{}-backports/Release' 'https://deb.debian.org/debian/dists/{}/Release'
APT_PREFERENCES_FREEDOMBOX = '''Explanation: This file is managed by FreedomBox, do not edit. APT_PREFERENCES_FREEDOMBOX = '''Explanation: This file is managed by FreedomBox, do not edit.
Explanation: Allow carefully selected updates to 'freedombox' from backports. Explanation: Allow carefully selected updates to 'freedombox' from backports.
@ -180,14 +180,16 @@ def _get_protocol():
return 'http' return 'http'
def _is_release_file_available(protocol, dist): def _is_release_file_available(protocol, dist, backports=False):
"""Return whether the release for backports is available.""" """Return whether the release for dist[-backports] is available."""
wrapper = None wrapper = None
if protocol == 'tor+http': if protocol == 'tor+http':
wrapper = 'torsocks' wrapper = 'torsocks'
result = check_url(BACKPORTS_RELEASE_FILE_URL.format(dist), if backports:
wrapper=wrapper) dist += '-backports'
result = check_url(RELEASE_FILE_URL.format(dist), wrapper=wrapper)
return result == 'passed' return result == 'passed'
@ -238,7 +240,7 @@ def _check_and_backports_sources(develop=False):
if protocol == 'tor+http': if protocol == 'tor+http':
print('Package download over Tor is enabled.') print('Package download over Tor is enabled.')
if not _is_release_file_available(protocol, dist): if not _is_release_file_available(protocol, dist, backports=True):
print(f'Release file for {dist}-backports is not available yet.') print(f'Release file for {dist}-backports is not available yet.')
return return