From 8358000299a45b69febff82dfd3f26b7838e4daf Mon Sep 17 00:00:00 2001 From: Rajasi Rane Date: Wed, 13 Sep 2023 14:51:34 -0700 Subject: [PATCH] Adding EULA acceptance: code cleanup --- src/core/src/bootstrap/ConfigurationFactory.py | 7 +++---- src/core/src/package_managers/AptitudePackageManager.py | 1 - 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/core/src/bootstrap/ConfigurationFactory.py b/src/core/src/bootstrap/ConfigurationFactory.py index 0b467b40..545d2921 100644 --- a/src/core/src/bootstrap/ConfigurationFactory.py +++ b/src/core/src/bootstrap/ConfigurationFactory.py @@ -16,8 +16,6 @@ """ Configure factory. This module populates configuration based on package manager and environment, e.g. TEST/DEV/PROD""" from __future__ import print_function - -import json import os import time from core.src.bootstrap.Constants import Constants @@ -93,7 +91,8 @@ def get_bootstrap_configuration(self, env): configuration_key = str.lower('{0}_config'.format(str(env))) return self.bootstrap_configurations[configuration_key] - def get_arguments_configuration(self, argv): + @staticmethod + def get_arguments_configuration(argv): """ Composes the configuration with the passed in arguments. """ arguments_config = { 'execution_arguments': str(argv), @@ -101,7 +100,7 @@ def get_arguments_configuration(self, argv): 'component': ExecutionConfig, 'component_args': ['env_layer', 'composite_logger'], 'component_kwargs': { - 'execution_parameters': str(argv), + 'execution_parameters': str(argv) } } } diff --git a/src/core/src/package_managers/AptitudePackageManager.py b/src/core/src/package_managers/AptitudePackageManager.py index e49f744d..706e2fff 100644 --- a/src/core/src/package_managers/AptitudePackageManager.py +++ b/src/core/src/package_managers/AptitudePackageManager.py @@ -292,7 +292,6 @@ def get_composite_package_identifier(self, package, package_version): def install_updates_fail_safe(self, excluded_packages): return - # endregion # region Package Information