From c8ea31a00106398380f1476ba82aada24938d2aa Mon Sep 17 00:00:00 2001 From: Richard Killen Date: Fri, 4 Nov 2022 09:46:18 -0500 Subject: [PATCH 1/2] Don't add domain libraries when -skip_archive is specified --- .../python/wlsdeploy/tool/discover/domain_info_discoverer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/python/wlsdeploy/tool/discover/domain_info_discoverer.py b/core/src/main/python/wlsdeploy/tool/discover/domain_info_discoverer.py index 499b1b60af..39308d55fe 100644 --- a/core/src/main/python/wlsdeploy/tool/discover/domain_info_discoverer.py +++ b/core/src/main/python/wlsdeploy/tool/discover/domain_info_discoverer.py @@ -87,7 +87,7 @@ def get_domain_libs(self): archive_file = self._model_context.get_archive_file() domain_lib = self._convert_path('lib') entries = [] - if os.path.isdir(domain_lib): + if os.path.isdir(domain_lib) and not self._model_context.skip_archive: _logger.finer('WLSDPLY-06420', domain_lib, class_name=_class_name, method_name=_method_name) for entry in os.listdir(domain_lib): entry_path = os.path.join(domain_lib, entry) From b7554ad27c380513f630caa87ab3429ad4bb06f0 Mon Sep 17 00:00:00 2001 From: Richard Killen Date: Fri, 4 Nov 2022 09:52:25 -0500 Subject: [PATCH 2/2] Call skip_archive as a function --- .../python/wlsdeploy/tool/discover/domain_info_discoverer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/python/wlsdeploy/tool/discover/domain_info_discoverer.py b/core/src/main/python/wlsdeploy/tool/discover/domain_info_discoverer.py index 39308d55fe..4c35bde50f 100644 --- a/core/src/main/python/wlsdeploy/tool/discover/domain_info_discoverer.py +++ b/core/src/main/python/wlsdeploy/tool/discover/domain_info_discoverer.py @@ -87,7 +87,7 @@ def get_domain_libs(self): archive_file = self._model_context.get_archive_file() domain_lib = self._convert_path('lib') entries = [] - if os.path.isdir(domain_lib) and not self._model_context.skip_archive: + if os.path.isdir(domain_lib) and not self._model_context.skip_archive(): _logger.finer('WLSDPLY-06420', domain_lib, class_name=_class_name, method_name=_method_name) for entry in os.listdir(domain_lib): entry_path = os.path.join(domain_lib, entry) @@ -121,7 +121,7 @@ def get_user_env_scripts(self): else: archive_file = self._model_context.get_archive_file() domain_bin = self._convert_path('bin') - if os.path.isdir(domain_bin) and not self._model_context.skip_archive: + if os.path.isdir(domain_bin) and not self._model_context.skip_archive(): search_directory = FileUtils.fixupFileSeparatorsForJython(os.path.join(domain_bin, "setUserOverrides*.*")) _logger.finer('WLSDPLY-06425', search_directory, class_name=_class_name, method_name=_method_name) file_list = glob.glob(search_directory)