summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Babinsky <mbabinsk@redhat.com>2017-02-17 14:00:24 +0100
committerMartin Basti <mbasti@redhat.com>2017-03-01 15:55:45 +0100
commitc17215ea3db58c7a5fe6e30b6b38f4f3012e25d2 (patch)
tree3dd49dd62f6a786ec09ec865774f0e00c5bb13ff
parent9348cfa996ce450bc88a4b35ee3f3bf52adfff39 (diff)
downloadfreeipa-c17215ea3db58c7a5fe6e30b6b38f4f3012e25d2.tar.gz
freeipa-c17215ea3db58c7a5fe6e30b6b38f4f3012e25d2.tar.xz
freeipa-c17215ea3db58c7a5fe6e30b6b38f4f3012e25d2.zip
adtrust.py: Use logging to emit error messages
Plain print messages are a) not logged into files and b) get lost in the output from composite installer. https://fedorahosted.org/freeipa/ticket/6630 Reviewed-By: Martin Basti <mbasti@redhat.com> Reviewed-By: Jan Cholasta <jcholast@redhat.com>
-rw-r--r--ipaserver/install/adtrust.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/ipaserver/install/adtrust.py b/ipaserver/install/adtrust.py
index deb43012a..4694a25ca 100644
--- a/ipaserver/install/adtrust.py
+++ b/ipaserver/install/adtrust.py
@@ -31,9 +31,10 @@ reset_netbios_name = False
def netbios_name_error(name):
- print("\nIllegal NetBIOS name [%s].\n" % name)
- print("Up to 15 characters and only uppercase ASCII letters, digits "
- "and dashes are allowed. Empty string is not allowed.")
+ root_logger.error("\nIllegal NetBIOS name [%s].\n" % name)
+ root_logger.error(
+ "Up to 15 characters and only uppercase ASCII letters, digits "
+ "and dashes are allowed. Empty string is not allowed.")
def read_netbios_name(netbios_default):
@@ -198,9 +199,9 @@ def retrieve_entries_without_sid(api):
# All objects have SIDs assigned
pass
except (errors.DatabaseError, errors.NetworkError) as e:
- print("Could not retrieve a list of objects that need a SID "
- "identifier assigned:")
- print(unicode(e))
+ root_logger.error(
+ "Could not retrieve a list of objects that need a SID "
+ "identifier assigned: %s", e)
return []
@@ -254,8 +255,8 @@ def retrieve_potential_adtrust_agents(api):
dl_enabled_masters = api.Command.server_find(
ipamindomainlevel=DOMAIN_LEVEL_0, all=True)['result']
except (errors.DatabaseError, errors.NetworkError) as e:
- print("Could not retrieve a list of existing IPA masters:")
- print(unicode(e))
+ root_logger.error(
+ "Could not retrieve a list of existing IPA masters: %s", e)
return
try:
@@ -263,8 +264,7 @@ def retrieve_potential_adtrust_agents(api):
adtrust_agents = api.Command.server_find(
servrole=u'AD trust agent', all=True)['result']
except (errors.DatabaseError, errors.NetworkError) as e:
- print("Could not retrieve a list of adtrust agents:")
- print(unicode(e))
+ root_logger.error("Could not retrieve a list of adtrust agents: %s", e)
return
dl_enabled_master_cns = {m['cn'][0] for m in dl_enabled_masters}