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: Split apt preferences into 2 files

Browse Source 
- 50freedombox4.pref handles freedombox package from current
  backports. Whenever upgrading to a new Debian release, backports can
  be activated for the new release, and will always include the
  freedombox package at the start.

- 51freedombox-apps.pref handles apps, and each entry is particular to
  a Debian release. For example, after bullseye release, entries from
  bullseye-backports can be added, and entries from buster-backports
  can be removed.

Tests:
- In testing container, run setup in development mode. Apt preferences
  files have the expected content.
- In stable vagrant box, install deb with these changes. Apt
  preferences files have the expected content.

Signed-off-by: James Valleroy <jvalleroy@mailbox.org>
Reviewed-by: Sunil Mohan Adapa <sunil@medhas.org>
This commit is contained in:
James Valleroy 2020-07-06 11:33:53 -04:00 committed by Sunil Mohan Adapa
parent 2f1a6dc0f7
commit a60341f0d8
No known key found for this signature in database
GPG Key ID: 43EA1CFF0AA7C5F2
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
actions/upgrades
View File

@ -21,15 +21,17 @@ DPKG_LOG_FILE = '/var/log/unattended-upgrades/unattended-upgrades-dpkg.log'
BACKPORTS_RELEASE_FILE_URL = \ BACKPORTS_RELEASE_FILE_URL = \
'https://deb.debian.org/debian/dists/{}-backports/Release' 'https://deb.debian.org/debian/dists/{}-backports/Release'
# Whenever these preferences needs to change, increment the version number APT_PREFERENCES_FREEDOMBOX = '''Explanation: This file is managed by FreedomBox, do not edit.
# upgrades app. This ensures that setup is run again and the new contents are
# overwritten on the old file.
APT_PREFERENCES = '''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.
Package: freedombox Package: freedombox
Pin: release a={}-backports Pin: release a={}-backports
Pin-Priority: 500 Pin-Priority: 500
'''
# Whenever these preferences needs to change, increment the version number
# upgrades app. This ensures that setup is run again and the new contents are
# overwritten on the old file.
APT_PREFERENCES_APPS = '''Explanation: This file is managed by FreedomBox, do not edit.
Explanation: matrix-synapse 0.99.5 introduces room version 4. Older version Explanation: matrix-synapse 0.99.5 introduces room version 4. Older version
Explanation: 0.99.2 in buster won't be able join newly created rooms. Explanation: 0.99.2 in buster won't be able join newly created rooms.
Package: matrix-synapse Package: matrix-synapse
@ -255,9 +257,11 @@ def _add_apt_preferences():
print(f'System distribution is {dist}. Skip setting apt preferences ' print(f'System distribution is {dist}. Skip setting apt preferences '
'for backports.') 'for backports.')
else: else:
print('Setting apt preferences for backports.') print(f'Setting apt preferences for {dist}-backports.')
with open(base_path / '50freedombox4.pref', 'w') as file_handle: with open(base_path / '50freedombox4.pref', 'w') as file_handle:
file_handle.write(APT_PREFERENCES.format(dist)) file_handle.write(APT_PREFERENCES_FREEDOMBOX.format(dist))
with open(base_path / '51freedombox-apps.pref', 'w') as file_handle:
file_handle.write(APT_PREFERENCES_APPS)
def subcommand_setup(_): def subcommand_setup(_):

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

@ -17,7 +17,7 @@ from plinth import cfg, glib, menu
from .manifest import backup # noqa, pylint: disable=unused-import from .manifest import backup # noqa, pylint: disable=unused-import
version = 3 version = 4
is_essential = True is_essential = True