From ff09ae25ecdbd1e1a0d865aa0edcea898a990d2d Mon Sep 17 00:00:00 2001 From: Natalia Serrano Date: Tue, 22 Oct 2024 09:57:53 +0000 Subject: [PATCH] refs #1013 do not restore envvars --- installer/ogboot_installer.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/installer/ogboot_installer.py b/installer/ogboot_installer.py index 73966c5..bdc48d1 100755 --- a/installer/ogboot_installer.py +++ b/installer/ogboot_installer.py @@ -41,6 +41,8 @@ INETDSERV = "xinetd" UBUNTU_OS_VERSION = "24" PYTHON_VERSION = 3 +os.environ['DEBIAN_FRONTEND'] = 'noninteractive' + log_file = f'/var/log/{PROGRAM}.log' os.makedirs(os.path.dirname(log_file), exist_ok=True) subprocess.run(['touch', log_file]) @@ -148,10 +150,8 @@ def install_packages(log_packages_file="/tmp/installed_packages.log"): return logger.info("Upgrading the system...") - original_debian_frontend = os.environ.get('DEBIAN_FRONTEND') try: - os.environ['DEBIAN_FRONTEND'] = 'noninteractive' subprocess.run(["apt-get", "update"], check=True) subprocess.run( ["apt-get", "install", "--allow-change-held-packages", "-y", "--no-install-recommends"] + missing + ['apache2-'], @@ -173,12 +173,6 @@ def install_packages(log_packages_file="/tmp/installed_packages.log"): subprocess.run(["apt-get", "install", "-y", "php8.3-fpm"], check=True) else: logger.warning("PHP version not supported.") - - finally: - if original_debian_frontend is not None: - os.environ['DEBIAN_FRONTEND'] = original_debian_frontend - else: - del os.environ['DEBIAN_FRONTEND'] def add_sudoers_permissions(): sudoers_entry = """