diff options
| -rw-r--r-- | debian/bcfg2-server.init | 2 | ||||
| -rw-r--r-- | src/lib/Server/Plugins/Account.py | 4 | ||||
| -rw-r--r-- | src/sbin/GenerateHostInfo | 11 |
3 files changed, 9 insertions, 8 deletions
diff --git a/debian/bcfg2-server.init b/debian/bcfg2-server.init index 35d41833a..b48eda46c 100644 --- a/debian/bcfg2-server.init +++ b/debian/bcfg2-server.init @@ -14,7 +14,7 @@ case "$1" in if [ -f "/etc/SuSE-release" ] ; then /sbin/start_daemon -p "${PIDFILE}" /usr/sbin/Bcfg2Server else - /sbin/start-stop-daemon -p "${PIDFILE}" -b -S -x /usr/sbin/Bcfg2Server + /sbin/start-stop-daemon --pidfile "${PIDFILE}" --make-pidfile -b -S --startas /usr/sbin/Bcfg2Server fi echo "Bcfg2Server" ;; diff --git a/src/lib/Server/Plugins/Account.py b/src/lib/Server/Plugins/Account.py index d618842cd..bd902fa0b 100644 --- a/src/lib/Server/Plugins/Account.py +++ b/src/lib/Server/Plugins/Account.py @@ -1,5 +1,5 @@ '''This handles authentication setup''' -__revision__ = '$Revision$' +__revision__ = '$Revision: 1.28 $' from Bcfg2.Server.Plugin import Plugin, PluginInitError, DirectoryBacked @@ -13,7 +13,7 @@ class Account(Plugin): rootlike -> users to be granted root privs on some hosts ''' __name__ = 'Account' - __version__ = '$Id$' + __version__ = '$Id: Account.py 1.28 05/11/30 17:31:55-06:00 desai@topaz.mcs.anl.gov $' __author__ = 'bcfg-dev@mcs.anl.gov' def __init__(self, core, datastore): diff --git a/src/sbin/GenerateHostInfo b/src/sbin/GenerateHostInfo index 1993ddb19..f8f33db08 100644 --- a/src/sbin/GenerateHostInfo +++ b/src/sbin/GenerateHostInfo @@ -16,13 +16,14 @@ def pretty_print(element, level=0): fmt = "%s<%%s %%s>%%s</%%s>" % (level*" ") data = (element.tag, (" ".join(["%s='%s'" % keyval for keyval in element.attrib.iteritems()])), element.text, element.tag) - if element._children: - fmt = "%s<%%s %%s>\n" % (level*" ",) + (len(element._children) * "%s") + "%s</%%s>\n" % (level*" ") - data = (element.tag, ) + (" ".join(["%s='%s'" % keyval for keyval in element.attrib.iteritems()]),) - data += tuple([pretty_print(entry, level+2) for entry in element._children]) + (element.tag, ) + children = element.getchildren() + if children: + fmt = "%s<%%s %%s>\n" % (level*" ",) + (len(children) * "%s") + "%s</%%s>\n" % (level*" ") + data = (element.tag, ) + (" ".join(["%s='%s'" % (key, element.attrib[key]) for key in element.attrib]),) + data += tuple([pretty_print(entry, level+2) for entry in children]) + (element.tag, ) else: fmt = "%s<%%s %%s/>\n" % (level * " ") - data = (element.tag, " ".join(["%s='%s'" % keyval for keyval in element.attrib.iteritems()])) + data = (element.tag, " ".join(["%s='%s'" % (key, element.attrib[key]) for key in element.attrib])) return fmt % data |