From 5ea78f6e28adc6c4722fb5e2216ff306e6441db7 Mon Sep 17 00:00:00 2001 From: James Valleroy Date: Fri, 18 Mar 2022 13:22:04 -0400 Subject: [PATCH] upgrades: Allow backports from src:freedombox This allows any binary package in src:freedombox to be upgraded from backports, so that packaged manuals are included. Thanks for Frank Woodward for finding the root cause and solution. Tests: - Build a FreedomBox bullseye image with backports disabled. - During setup, enable backports, and update packages. freedombox package from bullseye-backports is installed, but freedombox-doc-* packages are from bullseye. - Install freedombox package with the fix, and update packages. freedombox-doc-* packages from bullseye-backports are installed. Closes #2106. Signed-off-by: James Valleroy Reviewed-by: Sunil Mohan Adapa --- actions/upgrades | 2 +- plinth/modules/upgrades/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/actions/upgrades b/actions/upgrades index 5f117aa9e..9aa3f8c3c 100755 --- a/actions/upgrades +++ b/actions/upgrades @@ -34,7 +34,7 @@ RELEASE_FILE_URL = \ APT_PREFERENCES_FREEDOMBOX = '''Explanation: This file is managed by FreedomBox, do not edit. Explanation: Allow carefully selected updates to 'freedombox' from backports. -Package: freedombox +Package: src:freedombox Pin: release a={}-backports Pin-Priority: 500 ''' diff --git a/plinth/modules/upgrades/__init__.py b/plinth/modules/upgrades/__init__.py index 3b2286bda..42b579b6a 100644 --- a/plinth/modules/upgrades/__init__.py +++ b/plinth/modules/upgrades/__init__.py @@ -62,7 +62,7 @@ class UpgradesApp(app_module.App): app_id = 'upgrades' - _version = 10 + _version = 11 can_be_disabled = False