commit: 305e47ed1a83c00a64da33035ddad2844c475efe
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 8 08:03:37 2025 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sat Feb 15 09:04:28 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=305e47ed
eclass/apache-2.eclass: remove obsolete upgrade check
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
eclass/apache-2.eclass | 22 ----------------------
1 file changed, 22 deletions(-)
diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass
index 8572c7c195ac..c62d19ed6b28 100644
--- a/eclass/apache-2.eclass
+++ b/eclass/apache-2.eclass
@@ -409,26 +409,6 @@ generate_load_module() {
"${GENTOO_PATCHDIR}"/conf/httpd.conf
}
-# @FUNCTION: check_upgrade
-# @DESCRIPTION:
-# This internal function checks if the previous configuration file for built-in
-# modules exists in ROOT and prevents upgrade in this case. Users are supposed
-# to convert this file to the new APACHE2_MODULES USE_EXPAND variable and
remove
-# it afterwards.
-check_upgrade() {
- if [[ -e "${EROOT}"etc/apache2/apache2-builtin-mods ]]; then
- eerror "The previous configuration file for built-in modules"
- eerror "(${EROOT}etc/apache2/apache2-builtin-mods) exists on
your"
- eerror "system."
- eerror
- eerror "Please read
https://wiki.gentoo.org/wiki/Project:Apache/Upgrading";
- eerror "for detailed information how to convert this file to
the new"
- eerror "APACHE2_MODULES USE_EXPAND variable."
- eerror
- die "upgrade not possible with existing
${ROOT}etc/apache2/apache2-builtin-mods"
- fi
-}
-
#
==============================================================================
# EXPORTED FUNCTIONS
#
==============================================================================
@@ -439,8 +419,6 @@ check_upgrade() {
# creates the apache user and group and informs about CONFIG_SYSVIPC being
# needed (we don't depend on kernel sources and therefore cannot check).
apache-2_pkg_setup() {
- check_upgrade
-
setup_mpm
setup_modules
