Skip to content

Commit 77927e4

Browse files
committed
Only log TODO if there is something to do
1 parent 992d86e commit 77927e4

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

core/src/main/python/wlsdeploy/tool/deploy/model_deployer.py

+6-3
Original file line numberDiff line numberDiff line change
@@ -162,22 +162,25 @@ def extract_weblogic_remote_console_extension(self):
162162
if found_ext:
163163
self._upload_extracted_directory(WLSDeployArchive.WRC_EXTENSION_TARGET_DIR_NAME)
164164

165-
def _add_warnings_for_remote_update_files(self, archive_name, file_paths, destination):
166-
_logger.todo('WLSDPLY-06044', archive_name, ', '.join(file_paths), destination)
165+
def _add_warnings_for_remote_update_files(self, archive_name, file_paths, destination, method_name):
166+
if file_paths is not None and len(file_paths) > 0:
167+
_logger.todo('WLSDPLY-06044', archive_name, ', '.join(file_paths), destination,
168+
class_name=_class_name, method_name=method_name)
167169

168170
def extract_all_database_wallets(self):
169171
"""
170172
Extract all the database wallets in the archive(s) to the target domain.
171173
Use SSH if the domain is on a remote system.
172174
"""
175+
_method_name = 'extract_all_database_wallets'
173176
archive_list = self.archive_helper
174177

175178
if archive_list:
176179
if self.model_context.is_remote():
177180
wallet_paths = archive_list.get_all_database_wallet_paths()
178181
for wallet in wallet_paths:
179182
remote_dir = self.model_context.get_domain_home()
180-
self._add_warnings_for_remote_update_files(wallet['archive'], wallet['paths'], remote_dir)
183+
self._add_warnings_for_remote_update_files(wallet['archive'], wallet['paths'], remote_dir, _method_name)
181184
elif not self.model_context.is_ssh():
182185
archive_list.extract_all_database_wallets()
183186
else:

documentation/4.0/content/release-notes/_index.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,10 @@ pre = "<b> </b>"
6767
- #1619 - Fixed a bug that was causing offline discovery to omit the `LogRotation` attribute when the value was set to `none`.
6868
- #1631 - Fixed an issue where the Update Domain and the Deploy Applications Tools running in online mode were trying to
6969
call start on an application when earlier changes required a server restart.
70-
- #1632 - Fixed an issue with the `ResourceManagement` MBean when running the Discover Domain Tool in online mode with
70+
- #1634 - Fixed an issue with the `ResourceManagement` MBean when running the Discover Domain Tool in online mode with
7171
WebLogic Server 14.1.1 and newer.
72+
- #1636 - Fixed an issue with Update Domain and Deploy Applications Tools when using the `-remote` option that was
73+
causing a TODO message to be generated when there was nothing for the user to do.
7274

7375
#### Known Issues
7476
- SSH support for the Update Domain Tool and Deploy Apps Tool do not work when using an archive file and the remote

0 commit comments

Comments
 (0)