Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2025-04-20 14:20:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Select proper PHP version on RPM based OS after INSTALLER_DEPS have been installed (#4325)

Browse source 
* Select proper PHP version on RPM based OS after INSTALLER_DEPS have been installed

* Remove check for unsupported RPM distros as it is checked in os_check already

* Add select_rpm_php function to tox tests

Signed-off-by: Christian König <ckoenig@posteo.de>
This commit is contained in:
yubiuser 2021-09-12 22:40:37 +02:00 • committed by GitHub
parent 6d670991c3
commit 1c286c7bc4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 103 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/test_automated_install.py
View file

@ -618,6 +618,7 @@ def test_package_manager_has_pihole_deps(Pihole):
output = Pihole.run('''
source /opt/pihole/basic-install.sh
package_manager_detect
select_rpm_php
install_dependent_packages ${PIHOLE_DEPS[@]}
''')
@ -631,6 +632,7 @@ def test_package_manager_has_web_deps(Pihole):
output = Pihole.run('''
source /opt/pihole/basic-install.sh
package_manager_detect
select_rpm_php
install_dependent_packages ${PIHOLE_WEB_DEPS[@]}
''')