diff options
| author | Tomas Babej <tbabej@redhat.com> | 2012-08-10 08:59:58 -0400 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2012-08-14 15:48:59 +0200 |
| commit | 2e00a9f45cd7c3191902f9b20ec4879096589219 (patch) | |
| tree | 4ce1b013ddcbd15c360507f2c7e928c0fb966779 | |
| parent | da55aadf7481e6154c364230c6eae0409e00379f (diff) | |
| download | freeipa-2e00a9f45cd7c3191902f9b20ec4879096589219.tar.gz freeipa-2e00a9f45cd7c3191902f9b20ec4879096589219.tar.xz freeipa-2e00a9f45cd7c3191902f9b20ec4879096589219.zip | |
Improves exception handling in ipa-replica-prepare.
A backtrace is no longer displayed when trying to prepare a replica
file with the local LDAP server down. Also adds --debug option and
no longer displays info messages without it.
https://fedorahosted.org/freeipa/ticket/2939
| -rwxr-xr-x | install/tools/ipa-replica-prepare | 8 | ||||
| -rw-r--r-- | install/tools/man/ipa-replica-prepare.1 | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/install/tools/ipa-replica-prepare b/install/tools/ipa-replica-prepare index 210a9de11..357848826 100755 --- a/install/tools/ipa-replica-prepare +++ b/install/tools/ipa-replica-prepare @@ -65,6 +65,8 @@ def parse_options(): help="Location of CA PKCS#12 file, default /root/cacert.p12") parser.add_option("--no-pkinit", dest="setup_pkinit", action="store_false", default=True, help="disables pkinit setup steps") + parser.add_option("--debug", dest="debug", action="store_true", + default=False, help="enable debugging") options, args = parser.parse_args() @@ -238,9 +240,11 @@ def main(): replica_fqdn = args[0] + standard_logging_setup(None, debug=options.debug) + # Just initialize the environment. This is so the installer can have # access to the plugin environment - api.bootstrap(in_server=True) + api.bootstrap(in_server=True, debug=options.debug) api.finalize() #Automatically disable pkinit w/ dogtag until that is supported @@ -270,6 +274,8 @@ def main(): sys.exit("\nThe password provided is incorrect for LDAP server %s" % api.env.host) except errors.LDAPError: sys.exit("\nUnable to connect to LDAP server %s" % api.env.host) + except errors.DatabaseError, e: + sys.exit("\n"+e.desc) try: installutils.verify_fqdn(replica_fqdn, local_hostname=False) diff --git a/install/tools/man/ipa-replica-prepare.1 b/install/tools/man/ipa-replica-prepare.1 index 744348381..f30ed10c1 100644 --- a/install/tools/man/ipa-replica-prepare.1 +++ b/install/tools/man/ipa-replica-prepare.1 @@ -68,6 +68,9 @@ Location of CA PKCS#12 file, default /root/cacert.p12 .TP \fB\-\-no\-pkinit\fR Disables pkinit setup steps +.TP +\fB\-\-debug\fR +Prints info log messages to the output .SH "EXIT STATUS" 0 if the command was successful |