From 2f7b3264d19feeedde17147aae9553d17405fc54 Mon Sep 17 00:00:00 2001
From: James Valleroy
Date: Tue, 21 Jul 2020 19:53:51 -0400
Subject: [PATCH] upgrades: Display correct backports info for unstable
Backports are not enabled and cannot be activated on unstable.
Signed-off-by: James Valleroy
[sunil: Add statement that backports may not be necessary]
Signed-off-by: Sunil Mohan Adapa
Reviewed-by: Sunil Mohan Adapa
Reviewed-by: James Valleroy
---
.../templates/upgrades_configure.html | 23 ++++++++++++-------
plinth/modules/upgrades/views.py | 1 +
2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/plinth/modules/upgrades/templates/upgrades_configure.html b/plinth/modules/upgrades/templates/upgrades_configure.html
index 2c0bc92fb..0765216f9 100644
--- a/plinth/modules/upgrades/templates/upgrades_configure.html
+++ b/plinth/modules/upgrades/templates/upgrades_configure.html
@@ -15,20 +15,27 @@
Frequent feature updates can be activated. Activating them is
recommended.
{% endblocktrans %}
- {% else %}
+ {% elif is_backports_enabled %}
{% blocktrans trimmed %}
Frequent feature updates are enabled.
{% endblocktrans %}
+ {% else %}
+ {% blocktrans trimmed %}
+ Frequent feature updates cannot be activated. They may not be necessary
+ on your distribution.
+ {% endblocktrans %}
{% endif %}
- {% blocktrans trimmed %}
- This will allow a very limited set of software, including FreedomBox
- service, to be updated to receive newer features regularly instead of once
- every 2 years or so. Note that packages with frequent feature updates do
- not have support from Debian Security Team. They are instead maintained by
- contributors to Debian and the FreedomBox community.
- {% endblocktrans %}
+ {% if can_activate_backports or is_backports_enabled %}
+ {% blocktrans trimmed %}
+ This will allow a very limited set of software, including FreedomBox
+ service, to be updated to receive newer features regularly instead of
+ once every 2 years or so. Note that packages with frequent feature
+ updates do not have support from Debian Security Team. They are instead
+ maintained by contributors to Debian and the FreedomBox community.
+ {% endblocktrans %}
+ {% endif %}
{% if can_activate_backports %}
diff --git a/plinth/modules/upgrades/views.py b/plinth/modules/upgrades/views.py
index 0b390ed9a..426ad6444 100644
--- a/plinth/modules/upgrades/views.py
+++ b/plinth/modules/upgrades/views.py
@@ -29,6 +29,7 @@ class UpgradesConfigurationView(AppView):
def get_context_data(self, *args, **kwargs):
context = super().get_context_data(*args, **kwargs)
context['can_activate_backports'] = upgrades.can_activate_backports()
+ context['is_backports_enabled'] = upgrades.is_backports_enabled()
context['is_busy'] = package.is_package_manager_busy()
context['log'] = get_log()
context['refresh_page_sec'] = 3 if context['is_busy'] else None