diff options
author | Martin Nagy <mnagy@redhat.com> | 2009-11-23 08:42:30 +0100 |
---|---|---|
committer | Martin Nagy <mnagy@redhat.com> | 2009-12-02 13:07:00 +0100 |
commit | 377907e2211875250e6af7fcb65d0548702c3c3d (patch) | |
tree | 14820bf4aec1b8e44fa028f3f599b32a7c154391 | |
parent | f3bd9bfb595cc71184d0aa760b28670e336142ab (diff) | |
download | freeipa-377907e2211875250e6af7fcb65d0548702c3c3d.tar.gz freeipa-377907e2211875250e6af7fcb65d0548702c3c3d.tar.xz freeipa-377907e2211875250e6af7fcb65d0548702c3c3d.zip |
Remove unnecessary "error: " prefixes
The parser.error() method prepends the "error: " prefix itself. Adding
it to the error string is not necessary and doesn't look good.
-rwxr-xr-x | install/tools/ipa-replica-prepare | 2 | ||||
-rwxr-xr-x | install/tools/ipa-server-install | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/install/tools/ipa-replica-prepare b/install/tools/ipa-replica-prepare index 3dc0ccce5..bc86a41a3 100755 --- a/install/tools/ipa-replica-prepare +++ b/install/tools/ipa-replica-prepare @@ -59,7 +59,7 @@ def parse_options(): pkcs12 = [options.dirsrv_pkcs12, options.http_pkcs12, options.dirsrv_pin, options.http_pin] cnt = pkcs12.count(None) if cnt > 0 and cnt < 4: - parser.error("error: All PKCS#12 options are required if any are used.") + parser.error("All PKCS#12 options are required if any are used.") if len(args) != 1: parser.error("must provide the fully-qualified name of the replica") diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index 63bb3590a..5ea8a1b04 100755 --- a/install/tools/ipa-server-install +++ b/install/tools/ipa-server-install @@ -131,11 +131,11 @@ def parse_options(): if (options.ds_user or options.realm_name or options.dm_password or options.admin_password or options.master_password): - parser.error("error: In uninstall mode, -u, r, -p and -P options are not allowed") + parser.error("In uninstall mode, -u, r, -p and -P options are not allowed") elif options.unattended: if (not options.ds_user or not options.realm_name or not options.dm_password or not options.admin_password): - parser.error("error: In unattended mode you need to provide at least -u, -r, -p and -a options") + parser.error("In unattended mode you need to provide at least -u, -r, -p and -a options") if options.setup_dns: if not options.forwarders and not options.no_forwarders: parser.error("You must specify at least one --forwarder option or --no-forwarders option") @@ -146,14 +146,14 @@ def parse_options(): pkcs12 = [options.dirsrv_pkcs12, options.http_pkcs12, options.dirsrv_pin, options.http_pin] cnt = pkcs12.count(None) if cnt > 0 and cnt < 4: - parser.error("error: All PKCS#12 options are required if any are used.") + parser.error("All PKCS#12 options are required if any are used.") if (options.external_cert_file or options.external_ca_file) and not options.ca: - parser.error("error: --ca required to use the external CA options.") + parser.error("--ca required to use the external CA options.") if ((options.external_cert_file and not options.external_ca_file) or (not options.external_cert_file and options.external_ca_file)): - parser.error("error: if either external option is used, both are required.") + parser.error("if either external option is used, both are required.") if options.external_ca and not options.ca: # Go ahead and be nice and fix things up |