Merge branch 'maint'

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>

Conflicts:
	doc/installation/distributions.txt
	doc/server/snapshots/index.txt
	src/lib/Bcfg2/Server/Plugin/helpers.py
	src/sbin/bcfg2-server

1 files changed, 7 insertions, 3 deletions

diff --git a/doc/exts/xmlschema.py b/doc/exts/xmlschema.py
index 24cbf2e2d..c26aed81e 100644
--- a/doc/exts/xmlschema.py
+++ b/doc/exts/xmlschema.py
@@ -115,6 +115,7 @@ class _XMLDirective(Directive):
     def run(self):
         name = self.arguments[0]
         env = self.state.document.settings.env
+        reporter = self.state.memo.reporter
         ns_name = self.options.get('namespace')
         try:
             ns_uri = env.xmlschema_namespaces[ns_name]
@@ -129,8 +130,9 @@ class _XMLDirective(Directive):
             except KeyError:
                 pass
         else:
-            env.app.error("No XML %s %s found" %
-                          (" or ".join(self.types), name))
+            reporter.error("No XML %s %s found" %
+                           (" or ".join(self.types), name))
+            return []
         documentor = XMLDocumentor(entity, env, self.state, name=name,
                                    ns_uri=ns_uri,
                                    include=self.process_include(),
@@ -172,6 +174,7 @@ class XMLDocumentor(object):
         self.include = include
         self.options = options
         self.app = self.env.app
+        self.reporter = self.state.memo.reporter
 
         if name is None:
             self.ns_uri = ns_uri
@@ -312,7 +315,8 @@ class XMLDocumentor(object):
                 rv.extend(doc.document_complexType())
                 return rv
             else:
-                self.app.error("Unknown element type %s" % fqtype)
+                self.reporter.error("Unknown element type %s" % fqtype)
+                return []
         else:
             rv = []
             typespec = self.entity.xpath("xs:complexType", namespaces=NSMAP)[0]