Merge branch 'master' into yumng

Conflicts:
	src/lib/Client/Tools/YUMng.py

2 files changed, 15 insertions, 7 deletions

diff --git a/src/sbin/bcfg2 b/src/sbin/bcfg2
index 534ab8238..5ddfd8791 100755
--- a/src/sbin/bcfg2
+++ b/src/sbin/bcfg2
@@ -7,6 +7,7 @@ import fcntl
 import logging
 import os
 import signal
+import socket
 import stat
 import sys
 import tempfile
@@ -199,6 +200,13 @@ class Client:
                 self.logger.error("Failed to download probes from bcfg2")
                 self.logger.error(flt.faultString)
                 raise SystemExit(1)
+            except (Bcfg2.Proxy.CertificateError,
+                    socket.gaierror,
+                    socket.error):
+                e = sys.exc_info()[1]
+                self.logger.error("Failed to download probes from bcfg2: %s"
+                                  % e)
+                raise SystemExit(1)
 
             times['probe_download'] = time.time()
 
diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info
index c36e1af42..07953ae69 100755
--- a/src/sbin/bcfg2-info
+++ b/src/sbin/bcfg2-info
@@ -375,21 +375,21 @@ class infoCore(cmd.Cmd, Bcfg2.Server.Core.Core):
             except:
                 print("Client %s not defined" % client)
                 continue
-            print("Hostname:\t", client_meta.hostname)
-            print("Profile:\t", client_meta.profile)
-            print("Groups:\t\t", list(client_meta.groups)[0])
+            print("Hostname:\t%s" % client_meta.hostname)
+            print("Profile:\t%s" % client_meta.profile)
+            print("Groups:\t\t%s" % list(client_meta.groups)[0])
             for grp in list(client_meta.groups)[1:]:
-                print('\t\t%s' % grp)
+                print("\t\t%s" % grp)
             if client_meta.bundles:
-                print("Bundles:\t", list(client_meta.bundles)[0])
+                print("Bundles:\t%s" % list(client_meta.bundles)[0])
             for bnd in list(client_meta.bundles)[1:]:
-                print('\t\t%s' % bnd)
+                print("\t\t%s" % bnd)
             if client_meta.connectors:
                 print("Connector data")
                 print("=" * 80)
                 for conn in client_meta.connectors:
                     if getattr(client_meta, conn):
-                        print("%s:\t" % (conn), getattr(client_meta, conn))
+                        print("%s:\t%s" % (conn, getattr(client_meta, conn)))
                         print("=" * 80)
 
     def do_mappings(self, args):