Hello,
documentation team proposed few changes in user-visible messages so here it
is. It was not worth a ticket and related overhead.
--
Petr^2 Spacek
From f7a421ea40c977943452aa3aedcab4be3059a958 Mon Sep 17 00:00:00 2001
From: Petr Spacek <pspa...@redhat.com>
Date: Mon, 13 Apr 2015 16:56:39 +0200
Subject: [PATCH] Clarify messages related to adding DNS forwarders
Proposed by Tomas Capek.
---
ipaserver/install/installutils.py | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/ipaserver/install/installutils.py b/ipaserver/install/installutils.py
index 787a1207abfbd378074719a88734338ef79485c8..52aa9736ec4d0405862bde8910f6e5ed29881e3c 100644
--- a/ipaserver/install/installutils.py
+++ b/ipaserver/install/installutils.py
@@ -248,24 +248,23 @@ def read_ip_addresses(host_name, fstore):
return ips
+
def read_dns_forwarders():
addrs = []
if ipautil.user_input("Do you want to configure DNS forwarders?", True):
- print "Enter the IP address of DNS forwarder to use, or press Enter to finish."
-
while True:
- ip = ipautil.user_input("Enter IP address for a DNS forwarder",
- allow_empty=True)
+ ip = ipautil.user_input("Enter an IP address for a DNS forwarder, "
+ "or press Enter to skip", allow_empty=True)
if not ip:
break
try:
ip_parsed = ipautil.CheckedIPAddress(ip, parse_netmask=False)
except Exception, e:
print "Error: Invalid IP Address %s: %s" % (ip, e)
- print "DNS forwarder %s not added" % ip
+ print "DNS forwarder %s not added." % ip
continue
- print "DNS forwarder %s added" % ip
+ print "DNS forwarder %s added. You may add another." % ip
addrs.append(str(ip_parsed))
if not addrs:
--
2.1.0
From 3019d40712f931db8b346e64616719a7b6d91657 Mon Sep 17 00:00:00 2001
From: Petr Spacek <pspa...@redhat.com>
Date: Mon, 13 Apr 2015 16:59:50 +0200
Subject: [PATCH] Grammar nazi fix
Proposed by Tomas Capek.
---
ipaserver/install/service.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ipaserver/install/service.py b/ipaserver/install/service.py
index 5a04ef323c1e89588a746603b52cbb4b9cdb8496..e4e5dd3ac304676df41dff2889eead8d8e253ecf 100644
--- a/ipaserver/install/service.py
+++ b/ipaserver/install/service.py
@@ -367,7 +367,7 @@ class Service(object):
end_message = "Done configuring %s." % self.service_desc
if runtime > 0:
- self.print_msg('%s: Estimated time %s' % (start_message,
+ self.print_msg('%s. Estimated time: %s' % (start_message,
format_seconds(runtime)))
else:
self.print_msg(start_message)
--
2.1.0
From 279073e982b2cf350e374ace7befa2a00f87e6b6 Mon Sep 17 00:00:00 2001
From: Petr Spacek <pspa...@redhat.com>
Date: Mon, 13 Apr 2015 17:02:24 +0200
Subject: [PATCH] Clarify host name output in ipa-client-install
Proposed by Tomas Capek
---
ipa-client/ipa-install/ipa-client-install | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install
index e31d83dc98d411d281c9913af6cd45b41e2b51a1..ed2935a7dbda844b40f990977b0238e496c4607c 100755
--- a/ipa-client/ipa-install/ipa-client-install
+++ b/ipa-client/ipa-install/ipa-client-install
@@ -2288,7 +2288,7 @@ def install(options, env, fstore, statestore):
root_logger.debug("will use discovered basedn: %s", cli_basedn)
subject_base = DN(('O', cli_realm))
- root_logger.info("Hostname: %s", hostname)
+ root_logger.info("Client hostname: %s", hostname)
root_logger.debug("Hostname source: %s", hostname_source)
root_logger.info("Realm: %s", cli_realm)
root_logger.debug("Realm source: %s", cli_realm_source)
--
2.1.0
--
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
