[projects/pld-builder.new] Move php_versions definition to config module
glen
glen at pld-linux.org
Thu Sep 29 16:43:35 CEST 2022
commit 98cbd198dd258f05618d21cb54aec0e1bf094550
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Thu Sep 29 17:42:33 2022 +0300
Move php_versions definition to config module
PLD_Builder/config.py | 2 ++
PLD_Builder/request.py | 3 +--
2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/PLD_Builder/config.py b/PLD_Builder/config.py
index a1a1d68..ec508c8 100644
--- a/PLD_Builder/config.py
+++ b/PLD_Builder/config.py
@@ -109,6 +109,8 @@ class Builder_Conf:
self.rpm_cache_dir = get("rpm_cache_dir", "/spools/ready")
self.builder_user = get("builder_user", "builder")
self.sudo_chroot_wrapper = get("sudo_chroot_wrapper", "")
+ # Available php versions in the distro
+ self.php_versions = get("php_versions", "4 5.2 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1").split(" ")
self.nice = get("nice", "0")
f = get("syslog", "")
diff --git a/PLD_Builder/request.py b/PLD_Builder/request.py
index 11973f9..f6f4667 100644
--- a/PLD_Builder/request.py
+++ b/PLD_Builder/request.py
@@ -408,8 +408,7 @@ class Batch:
return rpmdefs + rpmopts
def php_ignores(self, php_version):
- # available php versions in distro
- php_versions = ['4', '5.2', '5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1']
+ php_versions = config.php_versions.copy()
# remove current php version
try:
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/projects/pld-builder.new.git/commitdiff/e8b98bf9ab03ba6b05bcae1ec6b3a58dadefc3a8
More information about the pld-cvs-commit
mailing list