Merge branch 'maint'

Conflicts:
	src/lib/Bcfg2/Server/Admin/Viz.py
	src/lib/Bcfg2/Server/Plugins/Packages/__init__.py

2 files changed, 14 insertions, 9 deletions

diff --git a/src/lib/Bcfg2/Server/Plugins/Metadata.py b/src/lib/Bcfg2/Server/Plugins/Metadata.py
index 3d82beb87..a6e7700b7 100644
--- a/src/lib/Bcfg2/Server/Plugins/Metadata.py
+++ b/src/lib/Bcfg2/Server/Plugins/Metadata.py
@@ -1097,7 +1097,7 @@ class Metadata(Bcfg2.Server.Plugin.Metadata,
             if cname in self.aliases:
                 return self.aliases[cname]
             return cname
-        except socket.herror:
+        except (socket.gaierror, socket.herror):
             err = "Address resolution error for %s: %s" % (address,
                                                            sys.exc_info()[1])
             self.logger.error(err)
@@ -1437,7 +1437,7 @@ class Metadata(Bcfg2.Server.Plugin.Metadata,
         viz_str.extend(self._viz_groups(egroups, bundles, clientmeta))
         if key:
             for category in categories:
-                viz_str.append('"%s" [label="%s", shape="record", '
+                viz_str.append('"%s" [label="%s", shape="trapezium", '
                                'style="filled", fillcolor="%s"];' %
                                (category, category, categories[category]))
         return "\n".join("\t" + s for s in viz_str)
@@ -1452,7 +1452,7 @@ class Metadata(Bcfg2.Server.Plugin.Metadata,
         instances = {}
         rv = []
         for client in list(self.clients):
-            if include_client(client):
+            if not include_client(client):
                 continue
             if client in self.clientgroups:
                 grps = self.clientgroups[client]
@@ -1480,9 +1480,10 @@ class Metadata(Bcfg2.Server.Plugin.Metadata,
             the graph"""
             return not clientmeta or bundle in clientmeta.bundles
 
-        bundles = list(set(bund.get('name'))
-                       for bund in self.groups_xml.xdata.findall('.//Bundle')
-                       if include_bundle(bund.get('name')))
+        bundles = \
+            list(set(bund.get('name')
+                     for bund in self.groups_xml.xdata.findall('.//Bundle')
+                     if include_bundle(bund.get('name'))))
         bundles.sort()
         return ['"bundle-%s" [ label="%s", shape="septagon"];' % (bundle,
                                                                   bundle)
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
index 7dcc2dccc..5af9c1591 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
@@ -551,7 +551,11 @@ class Packages(Bcfg2.Server.Plugin.Plugin,
         if not self.sources.loaded:
             # if sources.xml has not received a FAM event yet, defer;
             # instantiate a dummy Collection object
-            return Collection(metadata, [], self.cachepath, self.data)
+            collection = Collection(metadata, [], self.cachepath, self.data)
+            ckey = collection.cachekey
+            self.groupcache.setdefault(ckey, dict())
+            self.pkgcache.setdefault(ckey, dict())
+            return collection
 
         if metadata.hostname in self.clients:
             return self.collections[self.clients[metadata.hostname]]
@@ -588,8 +592,8 @@ class Packages(Bcfg2.Server.Plugin.Plugin,
         if cclass != Collection:
             self.clients[metadata.hostname] = ckey
             self.collections[ckey] = collection
-            self.groupcache.setdefault(ckey, dict())
-            self.pkgcache.setdefault(ckey, dict())
+        self.groupcache.setdefault(ckey, dict())
+        self.pkgcache.setdefault(ckey, dict())
         return collection
 
     def get_additional_data(self, metadata):