ipapython/admintool.py: use SERVER_NOT_CONFIGURED

Commit 9182917280a5c2590fa677729db54b38a9ac4d1f introduced
SUCCESS, SERVER_INSTALL_ERROR and SERVER_NOT_CONFIGURED to
deal with cases when server is not configured.
Actually use SERVER_NOT_CONFIGURED in log_failure instead of 2.

Related-to: https://pagure.io/freeipa/issue/6843
Signed-off-by: François Cami <fcami@redhat.com>
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
Reviewed-By: Rob Crittenden <rcritten@redhat.com>
This commit is contained in:
François Cami 2019-07-29 11:22:09 +02:00 committed by Tibor Dudlák
parent 11e40336c5
commit 402246a729
No known key found for this signature in database
GPG Key ID: 12B8BD343576CDF5

View File

@ -317,9 +317,7 @@ class AdminTool:
# ipa-server-install. # ipa-server-install.
return return
message = "The %s command failed." % self.command_name message = "The %s command failed." % self.command_name
if self.log_file_initialized and return_value != 2: if self.log_file_initialized and return_value != SERVER_NOT_CONFIGURED:
# magic value because this is common between server and client
# but imports are not straigthforward
message += " See %s for more information" % self.log_file_name message += " See %s for more information" % self.log_file_name
logger.error('%s', message) logger.error('%s', message)