Merge branch 'maint'

Conflicts:
	doc/server/plugins/generators/cfg.txt
	doc/server/plugins/generators/tcheetah.txt
	src/lib/Bcfg2/Server/Admin/Xcmd.py
	src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
	src/lib/Bcfg2/Server/Plugins/Packages/Yum.py

5 files changed, 72 insertions, 23 deletions

diff --git a/src/sbin/bcfg2-admin b/src/sbin/bcfg2-admin
index 3bce7fdab..0e1e34c60 100755
--- a/src/sbin/bcfg2-admin
+++ b/src/sbin/bcfg2-admin
@@ -83,7 +83,7 @@ def main():
             raise SystemExit(1)
         mode = mode_cls()
         try:
-            mode(setup['args'][1:])
+            return mode(setup['args'][1:])
         finally:
             mode.shutdown()
     else:
@@ -93,6 +93,6 @@ def main():
 
 if __name__ == '__main__':
     try:
-        main()
+        sys.exit(main())
     except KeyboardInterrupt:
         raise SystemExit(1)
diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info
index 853c98845..1fd9bc067 100755
--- a/src/sbin/bcfg2-info
+++ b/src/sbin/bcfg2-info
@@ -472,7 +472,6 @@ Bcfg2 client itself.""")
             ('Path Bcfg2 repository', self.setup['repo']),
             ('Plugins', self.setup['plugins']),
             ('Password', self.setup['password']),
-            ('Server Metadata Connector', self.setup['mconnect']),
             ('Filemonitor', self.setup['filemonitor']),
             ('Server address', self.setup['location']),
             ('Path to key', self.setup['key']),
diff --git a/src/sbin/bcfg2-lint b/src/sbin/bcfg2-lint
index 2ae5e02d5..4987b8034 100755
--- a/src/sbin/bcfg2-lint
+++ b/src/sbin/bcfg2-lint
@@ -3,6 +3,7 @@
 """This tool examines your Bcfg2 specifications for errors."""
 
 import sys
+import time
 import inspect
 import logging
 import Bcfg2.Logger
@@ -51,7 +52,11 @@ def run_plugin(plugin, plugin_name, errorhandler=None, args=None, files=None):
         args.append(setup)
 
     # python 2.5 doesn't support mixing *magic and keyword arguments
-    return plugin(*args, **dict(files=files, errorhandler=errorhandler)).Run()
+    start = time.time()
+    rv = plugin(*args, **dict(files=files, errorhandler=errorhandler)).Run()
+    LOGGER.debug("  Ran %s in %0.2f seconds" % (plugin_name,
+                                                time.time() - start))
+    return rv
 
 
 def get_errorhandler():
diff --git a/src/sbin/bcfg2-test b/src/sbin/bcfg2-test
index 2065825ec..735a6c49c 100755
--- a/src/sbin/bcfg2-test
+++ b/src/sbin/bcfg2-test
@@ -5,6 +5,7 @@ without failures"""
 
 import os
 import sys
+import signal
 import fnmatch
 import logging
 import Bcfg2.Logger
@@ -191,9 +192,23 @@ def run_child(setup, clients, queue):
     core.shutdown()
 
 
+def get_sigint_handler(core):
+    """ Get a function that handles SIGINT/Ctrl-C by shutting down the
+    core and exiting properly."""
+
+    def hdlr(sig, frame):  # pylint: disable=W0613
+        """ Handle SIGINT/Ctrl-C by shutting down the core and exiting
+        properly. """
+        core.shutdown()
+        os._exit(1)  # pylint: disable=W0212
+
+    return hdlr
+
+
 def parse_args():
     """ Parse command line arguments. """
     optinfo = dict(Bcfg2.Options.TEST_COMMON_OPTIONS)
+
     optinfo.update(Bcfg2.Options.CLI_COMMON_OPTIONS)
     optinfo.update(Bcfg2.Options.SERVER_COMMON_OPTIONS)
     setup = Bcfg2.Options.load_option_parser(optinfo)
@@ -247,6 +262,7 @@ def main():
     setup = parse_args()
     logger = logging.getLogger(sys.argv[0])
     core = get_core(setup)
+    signal.signal(signal.SIGINT, get_sigint_handler(core))
 
     if setup['args']:
         clients = setup['args']
diff --git a/src/sbin/bcfg2-yum-helper b/src/sbin/bcfg2-yum-helper
index 7dbdad16b..4ef531d39 100755
--- a/src/sbin/bcfg2-yum-helper
+++ b/src/sbin/bcfg2-yum-helper
@@ -221,29 +221,58 @@ def main():
         logger.error("Config file %s not found" % options.config)
         return 1
 
+    # pylint: disable=W0702
+    rv = 0
     depsolver = DepSolver(options.config, options.verbose)
     if cmd == "clean":
-        depsolver.clean_cache()
-        print(json.dumps(True))
+        try:
+            depsolver.clean_cache()
+            print(json.dumps(True))
+        except:
+            logger.error("Unexpected error cleaning cache: %s" %
+                         sys.exc_info()[1], exc_info=1)
+            print(json.dumps(False))
+            rv = 2
     elif cmd == "complete":
-        data = json.loads(sys.stdin.read())
-        depsolver.groups = data['groups']
-        (packages, unknown) = depsolver.complete([pkg_to_tuple(p)
-                                                  for p in data['packages']])
-        print(json.dumps(dict(packages=list(packages),
-                              unknown=list(unknown))))
+        try:
+            data = json.loads(sys.stdin.read())
+        except:
+            logger.error("Unexpected error decoding JSON input: %s" %
+                         sys.exc_info()[1])
+            rv = 2
+        try:
+            depsolver.groups = data['groups']
+            (packages, unknown) = depsolver.complete(
+                [pkg_to_tuple(p) for p in data['packages']])
+            print(json.dumps(dict(packages=list(packages),
+                                  unknown=list(unknown))))
+        except:
+            logger.error("Unexpected error completing package set: %s" %
+                         sys.exc_info()[1], exc_info=1)
+            print(json.dumps(dict(packages=[], unknown=data['packages'])))
+            rv = 2
     elif cmd == "get_groups":
-        data = json.loads(sys.stdin.read())
-        rv = dict()
-        for gdata in data:
-            if "type" in gdata:
-                packages = depsolver.get_group(gdata['group'],
-                                               ptype=gdata['type'])
-            else:
-                packages = depsolver.get_group(gdata['group'])
-            rv[gdata['group']] = list(packages)
-        print(json.dumps(rv))
-
+        try:
+            data = json.loads(sys.stdin.read())
+            rv = dict()
+            for gdata in data:
+                if "type" in gdata:
+                    packages = depsolver.get_group(gdata['group'],
+                                                   ptype=gdata['type'])
+                else:
+                    packages = depsolver.get_group(gdata['group'])
+                rv[gdata['group']] = list(packages)
+            print(json.dumps(rv))
+        except:
+            logger.error("Unexpected error getting groups: %s" %
+                         sys.exc_info()[1], exc_info=1)
+            print(json.dumps(dict()))
+            rv = 2
+    else:
+        logger.error("Unknown command %s" % cmd)
+        print(json.dumps(None))
+        rv = 2
+    return rv
 
 if __name__ == '__main__':
     sys.exit(main())