Move the edkrepo_global_data_directory from the
GlobalConfig class to the base config class.
Updated the assignments of self.filename in both
the GlobalConfig and the GlobalUserConfig classes
as well as the initializaion of the BaseConfig
class to use get_edkrepo_global_data_directory()
Signed-off-by: Ashley E Desimone <ashley.e.desim...@intel.com>
Cc: Nate DeSimone <nathaniel.l.desim...@intel.com>
Cc: Puja Pandya <puja.pan...@intel.com>
Cc: Erik Bjorge <erik.c.bjo...@intel.com>
Cc: Bret Barkelew <bret.barke...@microsoft.com>
Cc: Prince Agyeman <prince.agye...@intel.com>
---
edkrepo/config/config_factory.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/edkrepo/config/config_factory.py b/edkrepo/config/config_factory.py
index e053f8b..a4daba3 100644
--- a/edkrepo/config/config_factory.py
+++ b/edkrepo/config/config_factory.py
@@ -77,10 +77,11 @@ class BaseConfig():
for the class. Property generation and verification is based off of a
list of CfgProp classes.
"""
prop_list = []
- def __init__(self, filename, read_only=True):
+ def __init__(self, filename, global_data_dir, read_only=True):
# Do basic initialization of private variables
self.read_only = read_only
self.filename = filename
+ self.global_data_dir = global_data_dir
self.cfg = configparser.ConfigParser(allow_no_value=True,
delimiters='=')
if os.path.isfile(self.filename):
self.cfg.read(self.filename)
@@ -136,8 +137,7 @@ class GlobalConfig(BaseConfig):
edkrepo installer.
"""
def __init__(self):
- self.edkrepo_global_data_directory =
get_edkrepo_global_data_directory()
- self.filename = os.path.join(self.edkrepo_global_data_directory,
"edkrepo.cfg")
+ self.filename = os.path.join(get_edkrepo_global_data_directory(),
"edkrepo.cfg")
self.prop_list = [
CfgProp('manifest-repo', 'URL', 'manifest_repo_url', None,
True),
CfgProp('manifest-repo', 'Branch', 'manifest_repo_branch',
None, True),
@@ -152,7 +152,7 @@ class GlobalConfig(BaseConfig):
CfgProp('preferred-entry-point', 'entry-point',
'pref_entry_point', None, True)]
if not os.path.isfile(self.filename):
raise
EdkrepoGlobalConfigNotFoundException(humble.GLOBAL_CFG_NOT_FOUND.format(self.filename))
- super().__init__(self.filename, True)
+ super().__init__(self.filename, get_edkrepo_global_data_directory(),
True)
@property
def preferred_entry(self):
@@ -169,7 +169,7 @@ class GlobalConfig(BaseConfig):
@property
def manifest_repo_abs_local_path(self):
"""Provides an absolute path to the manifest repo based on
configuration file values."""
- return os.path.join(self.edkrepo_global_data_directory,
self.manifest_repo_local_path)
+ return os.path.join(self.global_data_dir,
self.manifest_repo_local_path)
@property
def sparsecheckout_data(self):
@@ -196,7 +196,7 @@ class GlobalUserConfig(BaseConfig):
CfgProp('scm', 'mirror_geo', 'geo', 'none', False),
CfgProp('send-review', 'max-patch-set', 'max_patch_set', '10',
False)
]
- super().__init__(self.filename, False)
+ super().__init__(self.filename, get_edkrepo_global_data_directory(),
False)
@property
def max_patch_set_int(self):
--
2.16.2.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#57491): https://edk2.groups.io/g/devel/message/57491
Mute This Topic: https://groups.io/mt/73070623/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
