IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Log errors reported by adtrustinstance.check_inst() using logger

Browse Source 
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 <rcritten@redhat.com>
Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
This commit is contained in:
Rob Crittenden 2024-07-19 14:24:15 -04:00 committed by Florence Blanc-Renaud
parent ffba69648a
commit e83d949c7f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ipaserver/install/adtrustinstance.py
View File

@ -65,8 +65,8 @@ and re-run ipa-adtrust-instal again afterwards.
def check_inst(): def check_inst():
for smbfile in [paths.SMBD, paths.NET]: for smbfile in [paths.SMBD, paths.NET]:
if not os.path.exists(smbfile): if not os.path.exists(smbfile):
print("%s was not found on this system" % smbfile) logger.error("%s was not found on this system", smbfile)
print("Please install the 'samba' packages and " \ logger.error("Please install the 'samba' packages and "
"start the installation again") "start the installation again")
return False return False
@ -74,9 +74,10 @@ def check_inst():
# by looking for the file /usr/share/ipa/smb.conf.empty # by looking for the file /usr/share/ipa/smb.conf.empty
if not os.path.exists(os.path.join(paths.USR_SHARE_IPA_DIR, if not os.path.exists(os.path.join(paths.USR_SHARE_IPA_DIR,
"smb.conf.empty")): "smb.conf.empty")):
print("AD Trust requires the '%s' package" % logger.error("AD Trust requires the '%s' package",
constants.IPA_ADTRUST_PACKAGE_NAME) 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 return False
#TODO: Add check for needed samba4 libraries #TODO: Add check for needed samba4 libraries