--- a/usr/src/cmd/installadm/aimdns_mod.py Wed Apr 18 13:14:11 2012 -0600
+++ b/usr/src/cmd/installadm/aimdns_mod.py Thu Apr 19 10:29:48 2012 -0600
@@ -408,8 +408,8 @@
continue
if self.verbose:
- print cw(_('Registering %(name)s on %(interface)s'
- '(%(inf)s)') % {'name': name, 'interface': inf, \
+ print cw(_('Registering %(name)s on %(interface)s '
+ '(%(inf)s)') % {'name': name, 'interface': inf,
'inf': interfaces[inf]})
if smf_port is not None:
--- a/usr/src/cmd/installadm/client_control.py Wed Apr 18 13:14:11 2012 -0600
+++ b/usr/src/cmd/installadm/client_control.py Thu Apr 19 10:29:48 2012 -0600
@@ -182,8 +182,8 @@
server.add_option_arch()
server.add_host(full_mac, boot_tuples)
except dhcp.DHCPServerError as err:
- print cw(_("Unable to add host (%(mac)s) to DHCP"
- "configuration: %(error)s") % {'mac': full_mac, \
+ print cw(_("Unable to add host (%(mac)s) to DHCP "
+ "configuration: %(error)s") % {'mac': full_mac,
'error': err})
return
--- a/usr/src/cmd/installadm/dhcp.py Wed Apr 18 13:14:11 2012 -0600
+++ b/usr/src/cmd/installadm/dhcp.py Thu Apr 19 10:29:48 2012 -0600
@@ -682,7 +682,7 @@
"configuration file (%(cfgfile)s). Please ensure the "
"bootfile is properly set before using this service. "
"Please see dhcpd(8) for further information.\n") %
- {'bootfile': bootfile, 'arch': self.arch, \
+ {'bootfile': bootfile, 'arch': self.arch,
'cfgfile': current_cfgfile})
# Finally, rename the new temporary file to the configfile and return.
@@ -841,7 +841,7 @@
self._state)
raise DHCPServerError(cw(_("DHCP server is in an unexpected "
"state: action [%(action)s] "
- "state [%(state)s]") % {'action': \
+ "state [%(state)s]") % {'action':
action, 'state': self._state}))
def _add_stanza_to_config_file(self, new_stanza):
@@ -1539,7 +1539,7 @@
"%(ip)s; this should be changed to an "
"appropriate value in the DHCP configuration "
"file. Please see dhcpd(8) for further "
- "information.\n") % {'subnet': subnet_ip, \
+ "information.\n") % {'subnet': subnet_ip,
'ip': INVALID_IP})
logging.debug("dhcp._get_default_route_for_subnet: no route found")
--- a/usr/src/cmd/installadm/service.py Wed Apr 18 13:14:11 2012 -0600
+++ b/usr/src/cmd/installadm/service.py Thu Apr 19 10:29:48 2012 -0600
@@ -151,8 +151,8 @@
self.reason = reason
def __str__(self):
- return cw(_("\nUnable to mount '%(source)s' at '%(target)s':"
- "%(reason)s\n" % {'source': self.source, \
+ return cw(_("\nUnable to mount '%(source)s' at '%(target)s': "
+ "%(reason)s\n" % {'source': self.source,
'target': self.target, 'reason': self.reason}))
@@ -967,7 +967,7 @@
os.unlink(filename)
except OSError, emsg:
logging.warn(_("Could not delete profile %(filename)s: "
- "%(error)s") % {'filename': filename, \
+ "%(error)s") % {'filename': filename,
'error': emsg})
def validate_profiles(self):
@@ -1478,26 +1478,26 @@
logging.debug('cur_bootfile is %s', cur_bootfile)
if cur_bootfile is None:
# No bootfile set for this arch
- print cw(_("Setting the default %(type)s bootfile in "
- "the local DHCP configuration to "
- "'%(bfile)s'\n") % {'type': client_type, \
+ print cw(_("Setting the default %(type)s bootfile(s) "
+ "in the local DHCP configuration to:"
+ "\n%(bfile)s\n") % {'type': client_type,
'bfile': bfile})
server.add_bootfile_to_arch(arch, bootfile)
elif ((arch == 'sparc' and cur_bootfile != bfile) or
(arch == 'i386' and sorted(bootfile_tuples) !=
sorted(cur_bootfile))):
# Update the existing bootfile to our default
- print cw(_("Updating the default %(type)s bootfile in "
- "the local DHCP configuration from "
- "'%(bootfile)s' to '%(bfile)s'\n ") %
- {'type': client_type, \
- 'bootfile': cur_bootfile, 'bfile': bfile})
+ print cw(_("Updating the default %(type)s bootfile(s) "
+ "in the local DHCP configuration to:\n"
+ "%(bfile)s\n") % {'type': client_type,
+ 'bfile': bfile})
server.update_bootfile_for_arch(arch, bootfile)
else:
# Set up a whole new architecture class
- print cw(_("Setting the default %(type)s bootfile in the "
- "local DHCP configuration to '%(bfile)s'\n") %
- {'type': client_type, 'bfile': bfile})
+ print cw(_("Setting the default %(type)s bootfile(s) in "
+ "the local DHCP configuration to:\n"
+ "%(bfile)s\n") % {'type': client_type,
+ 'bfile': bfile})
server.add_arch_class(arch, bootfile)
except dhcp.DHCPServerError as err:
@@ -1535,12 +1535,13 @@
if arch == 'i386':
# Boot server IP is not needed for SPARC clients
- print _("\t%-20(msg)s : %(ip)s" % {'msg': "Boot server IP", \
+ print _("%(msg)s: %(ip)s" % {'msg': "Boot server IP",
'ip': server_ip})
- print _("\t%-20(msg)s : %(bootfile)s\n" % {'msg': "Boot file", \
- 'bootfile': bfile})
+ print _("%(msg)s:\n%(bfile)s" % {'msg': "Boot file(s)",
+ 'bfile': bfile})
else:
- print _("%s: %s\n" % ("Boot file", bfile))
+ print _("%(msg)s: %(bfile)s\n" % {'msg': "Boot file",
+ 'bfile': bfile})
if len(valid_nets) > 1 and arch == 'i386':
print cw(_("\nNote: determined more than one IP address "
--- a/usr/src/cmd/installadm/service_config.py Wed Apr 18 13:14:11 2012 -0600
+++ b/usr/src/cmd/installadm/service_config.py Thu Apr 19 10:29:48 2012 -0600
@@ -274,8 +274,8 @@
raise ServiceCfgError(cw(_("\nError: service name '%(name)s' does "
"not match %(service)s property "
"'%(prop_name)s'\n") %
- {'name': svcname, \
- 'service': PROP_SERVICE_NAME, \
+ {'name': svcname,
+ 'service': PROP_SERVICE_NAME,
'prop_name': prop_name}))
if PROP_STATUS not in props.keys():
@@ -294,7 +294,7 @@
if missing:
raise ServiceCfgError(cw(_('\nError: installation service key '
'properties missing for service %(name)s:'
- ' %(properties)s\n') % {'name': svcname, \
+ ' %(properties)s\n') % {'name': svcname,
'properties': ', '.join(missing)}))
--- a/usr/src/cmd/installadm/set_service.py Wed Apr 18 13:14:11 2012 -0600
+++ b/usr/src/cmd/installadm/set_service.py Thu Apr 19 10:29:48 2012 -0600
@@ -158,7 +158,7 @@
if aliassvc.is_aliasof(basesvcname):
raise SystemExit(_("\nError: %(aliasname)s is already an alias "
- "of %(svcname)s\n") % {'aliasname': aliasname, \
+ "of %(svcname)s\n") % {'aliasname': aliasname,
'svcname': basesvcname})
if svc.AIService(basesvcname).is_alias():
@@ -170,7 +170,7 @@
raise SystemExit(cw(_("\nError: %(aliasname)s can not be made an "
"alias of %(svcname)s because %(svcname)s is "
"dependent on %(aliasname)s\n") %
- {'aliasname': aliasname, \
+ {'aliasname': aliasname,
'svcname': basesvcname}))
# Remove clients of alias