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

zoph, wordpress: Add conflicts on libpam-tmpdir

Browse Source 
Closes: #2239.

- Adding Conflicts in freedombox Debian package seems to cause
unattended-upgrade to not upgrade the package to next version. This approach
seems be an alternative.

Tests:

- Install libpam-tmpdir. Go to Zoph page, see that conflicts messages is shown.
Install succeeds. libpam-tmpdir is removed.

- Install libpam-tmpdir. Go to WordPress page, see that conflicts messages is
shown. Install succeeds. libpam-tmpdir is removed.

- Remove libpam-tmpdir. Go to Zoph page, see that conflicts message is not
shown. Install succeeds.

- Remove libpam-tmpdir. Go to WordPress page, see that conflicts message is not
shown. Install succeeds.

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Sunil Mohan Adapa 2022-12-17 14:16:08 -08:00 committed by James Valleroy
parent 0b9d567493
commit b056f5829c
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plinth/modules/wordpress/__init__.py
View File

@ -81,7 +81,9 @@ class WordPressApp(app_module.App):
'php-zip', 'php-zip',
# WordPress only supports MySQL/MariaDB as DB # WordPress only supports MySQL/MariaDB as DB
'default-mysql-server', 'default-mysql-server',
]) ],
conflicts=['libpam-tmpdir'],
conflicts_action=Packages.ConflictsAction.REMOVE)
self.add(packages) self.add(packages)
firewall = Firewall('firewall-wordpress', info.name, firewall = Firewall('firewall-wordpress', info.name,

4
plinth/modules/zoph/__init__.py
View File

@ -67,7 +67,9 @@ class ZophApp(app_module.App):
login_required=True) login_required=True)
self.add(shortcut) self.add(shortcut)
packages = Packages('packages-zoph', ['zoph']) packages = Packages('packages-zoph', ['zoph'],
conflicts=['libpam-tmpdir'],
conflicts_action=Packages.ConflictsAction.REMOVE)
self.add(packages) self.add(packages)
firewall = Firewall('firewall-zoph', info.name, firewall = Firewall('firewall-zoph', info.name,