From e83d949c7f1734dff70379e360e9bbf626149c61 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Fri, 19 Jul 2024 14:24:15 -0400 Subject: [PATCH] Log errors reported by adtrustinstance.check_inst() using logger It previously only printed the issue which made troubleshooting after the fact difficult. Using logger.error() provides the same visual functionality but also logs to the server install log. Fixes: https://pagure.io/freeipa/issue/9637 Signed-off-by: Rob Crittenden Reviewed-By: Florence Blanc-Renaud --- ipaserver/install/adtrustinstance.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ipaserver/install/adtrustinstance.py b/ipaserver/install/adtrustinstance.py index 2ff68dfb4..fd5a5a282 100644 --- a/ipaserver/install/adtrustinstance.py +++ b/ipaserver/install/adtrustinstance.py @@ -65,8 +65,8 @@ and re-run ipa-adtrust-instal again afterwards. def check_inst(): for smbfile in [paths.SMBD, paths.NET]: if not os.path.exists(smbfile): - print("%s was not found on this system" % smbfile) - print("Please install the 'samba' packages and " \ + logger.error("%s was not found on this system", smbfile) + logger.error("Please install the 'samba' packages and " "start the installation again") return False @@ -74,9 +74,10 @@ def check_inst(): # by looking for the file /usr/share/ipa/smb.conf.empty if not os.path.exists(os.path.join(paths.USR_SHARE_IPA_DIR, "smb.conf.empty")): - print("AD Trust requires the '%s' package" % + logger.error("AD Trust requires the '%s' package", constants.IPA_ADTRUST_PACKAGE_NAME) - print("Please install the package and start the installation again") + logger.error( + "Please install the package and start the installation again") return False #TODO: Add check for needed samba4 libraries