Compare commits

...

2 Commits

Author SHA1 Message Date
Priit Jõerüüt
c14be44c8a
Translated using Weblate (Estonian)
Currently translated at 1.2% (24 of 1854 strings)
2025-06-21 08:42:37 -04:00
James Valleroy
d7d4958e8b
performance: Handle install for trixie
In trixie, cockpit-pcp is replaced by cockpit-bridge. However, our
packages module does not properly handle virtual packages.

- Specify cockpit-bridge and pcp as dependencies. In bookworm, they were
  dependencies of cockpit-pcp.

- Allow cockpit-bridge as a substitute for cockpit-pcp.

Tests:

- In stable container, install Performance app. Install succeeds and app
  is available.

- In testing container, install Performance app. Install succeeds and
  app is available.

- Build stable-backports package with new version. Install in stable VM.
  Install Performance app. Check that dist-upgrade succeeds. After
  dist-upgrade, Performance app is still working. Uninstalling
  Performance app works. Installing Performance app works. Diagnostics
  are all passed.

Note: There is one minor issue with the Diagnostics. Package
cockpit-bridge line is shown twice (both are passed).

Fixes: #2475

Signed-off-by: James Valleroy <jvalleroy@mailbox.org>
Reviewed-by: Sunil Mohan Adapa <sunil@medhas.org>
2025-06-21 08:42:28 -04:00
2 changed files with 28 additions and 18 deletions

View File

@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-04-21 20:08-0400\n" "POT-Creation-Date: 2025-04-21 20:08-0400\n"
"PO-Revision-Date: 2025-06-04 15:01+0000\n" "PO-Revision-Date: 2025-06-19 22:01+0000\n"
"Last-Translator: Priit Jõerüüt <hwlate@joeruut.com>\n" "Last-Translator: Priit Jõerüüt <hwlate@joeruut.com>\n"
"Language-Team: Estonian <https://hosted.weblate.org/projects/freedombox/" "Language-Team: Estonian <https://hosted.weblate.org/projects/freedombox/"
"freedombox/et/>\n" "freedombox/et/>\n"
@ -17,7 +17,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n" "Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 5.12-dev\n" "X-Generator: Weblate 5.12.1\n"
#: config.py:103 #: config.py:103
#, python-brace-format #, python-brace-format
@ -26,12 +26,12 @@ msgstr ""
#: context_processors.py:21 views.py:168 #: context_processors.py:21 views.py:168
msgid "FreedomBox" msgid "FreedomBox"
msgstr "" msgstr "FreedomBox"
#: daemon.py:124 #: daemon.py:124
#, python-brace-format #, python-brace-format
msgid "Service {service_name} is running" msgid "Service {service_name} is running"
msgstr "" msgstr "{service_name} teenus töötab"
#: daemon.py:222 #: daemon.py:222
#, python-brace-format #, python-brace-format
@ -87,15 +87,15 @@ msgstr ""
#: forms.py:92 #: forms.py:92
msgid "Language" msgid "Language"
msgstr "" msgstr "Keel"
#: forms.py:93 #: forms.py:93
msgid "Language to use for presenting this web interface" msgid "Language to use for presenting this web interface"
msgstr "" msgstr "Selles keeles kuvame kasutajaliidest"
#: forms.py:100 #: forms.py:100
msgid "Use the language preference set in the browser" msgid "Use the language preference set in the browser"
msgstr "" msgstr "Kasuta brauseris määratud keeleeelistusi"
#: menu.py:116 templates/base.html:120 #: menu.py:116 templates/base.html:120
msgid "Home" msgid "Home"
@ -137,24 +137,24 @@ msgstr "Lehte ei leidu: {url}"
#: middleware.py:150 #: middleware.py:150
msgid "Error running operation." msgid "Error running operation."
msgstr "" msgstr "Viga tegevuse käivitamisel."
#: middleware.py:152 #: middleware.py:152
msgid "Error loading page." msgid "Error loading page."
msgstr "" msgstr "Viga lehe laadimisel."
#: modules/apache/__init__.py:32 #: modules/apache/__init__.py:32
msgid "Apache HTTP Server" msgid "Apache HTTP Server"
msgstr "" msgstr "Apache HTTP Server"
#: modules/apache/__init__.py:46 #: modules/apache/__init__.py:46
msgid "Web Server" msgid "Web Server"
msgstr "" msgstr "Veebiserver"
#: modules/apache/__init__.py:52 #: modules/apache/__init__.py:52
#, python-brace-format #, python-brace-format
msgid "{box_name} Web Interface (Plinth)" msgid "{box_name} Web Interface (Plinth)"
msgstr "" msgstr "Veebiliides (Plinth) {box_name}"
#: modules/apache/components.py:162 #: modules/apache/components.py:162
#, python-brace-format #, python-brace-format
@ -232,26 +232,28 @@ msgstr ""
#: modules/backups/__init__.py:224 #: modules/backups/__init__.py:224
msgid "Error During Backup" msgid "Error During Backup"
msgstr "" msgstr "Viga varundamisel"
#: modules/backups/forms.py:34 #: modules/backups/forms.py:34
#, python-brace-format #, python-brace-format
msgid "{app} (No data to backup)" msgid "{app} (No data to backup)"
msgstr "" msgstr "{app} (pole varundatavaid andmeid)"
#: modules/backups/forms.py:54 #: modules/backups/forms.py:54
msgid "Enable scheduled backups" msgid "Enable scheduled backups"
msgstr "" msgstr "Kasuta varundamist etteantud graafiku alusel"
#: modules/backups/forms.py:55 #: modules/backups/forms.py:55
msgid "" msgid ""
"If enabled, a backup is taken every day, every week and every month. Older " "If enabled, a backup is taken every day, every week and every month. Older "
"backups are removed." "backups are removed."
msgstr "" msgstr ""
"Kui see eelistus on sisse lülitatud, siis tehakse varukoopia kord päevas, "
"kord nädalas ja kord kuus. Vanad varukoopiad kustutatakse."
#: modules/backups/forms.py:59 #: modules/backups/forms.py:59
msgid "Number of daily backups to keep" msgid "Number of daily backups to keep"
msgstr "" msgstr "Alleshoitavaid igapäevaseid varukoopiaid"
#: modules/backups/forms.py:60 #: modules/backups/forms.py:60
msgid "" msgid ""

View File

@ -9,7 +9,7 @@ from plinth import app as app_module
from plinth import menu from plinth import menu
from plinth.daemon import Daemon from plinth.daemon import Daemon
from plinth.modules.backups.components import BackupRestore from plinth.modules.backups.components import BackupRestore
from plinth.package import Packages from plinth.package import Package, Packages
from . import manifest from . import manifest
@ -49,7 +49,15 @@ class PerformanceApp(app_module.App):
order=40) order=40)
self.add(menu_item) self.add(menu_item)
packages = Packages('packages-performance', ['cockpit-pcp']) packages = Packages('packages-performance', [
# For bookworm, we need cockpit-pcp (which depends on
# cockpit-bridge and pcp). For trixie, cockpit-pcp is
# replaced by cockpit-bridge, and we need to specify a
# dependency on pcp. There is some issue with having a
# virtual package specified, see #2475.
Package('cockpit-pcp') | Package('cockpit-bridge'),
'cockpit-bridge', 'pcp'
])
self.add(packages) self.add(packages)
backup_restore = BackupRestore('backup-restore-performance', backup_restore = BackupRestore('backup-restore-performance',