From 1dc84ba7ebf1bb3b2734a9ea0dd1a4ba6660c93b Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Aug 05 2024 07:32:34 +0000 Subject: 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 --- diff --git a/ipaserver/install/adtrustinstance.py b/ipaserver/install/adtrustinstance.py index 2ff68df..fd5a5a2 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