Reverted r7018

tools/rosdoc/src/rosdoc/doxygenator.py

@@ -212,11 +212,9 @@ def run_rxdeps(package, pkg_doc_dir):
         print "rxdeping %s [%s]"%(package, ' '.join(command))
         Popen(command, stdout=PIPE).communicate()
     except OSError, (errno, strerr):
-        print >> sys.stderr, """\nERROR: It appears that you do not have rxdeps installed. 
+        print """\nERROR: It appears that you do not have rxdeps installed. 
 Package dependency tree links will not work properly.
 """
-    except:
-        print >> sys.stderr, "ERROR: rxdeps failed"
 
 ## Main entrypoint into creating doxygen files
 ## @param disable_rxdeps: if True, don't generate rxdeps documenation (note: this parameter is volatile as rxdeps generation will be moved outside of doxygenator)
@@ -248,9 +246,7 @@ def generate_doxygen(ctx, quiet=False, disable_rxdeps=False):
     tmpls = [header_template, footer_template, manifest_template]
     try:
         for package, path in packages.iteritems():
-            if not package in doc_packages or \
-                   not ctx.has_builder(package, 'doxygen') or \
-                   not package in manifests:
+            if not package in doc_packages or not ctx.has_builder(package, 'doxygen'):
                 continue
 
             # the logic for the doxygen builder is different from

tools/rosdoc/src/rosdoc/rdcore.py

@@ -83,13 +83,10 @@ class RosdocContext(object):
         except KeyError:
             print >> sys.stderr, "config file for [%s] is invalid, missing required 'builder' key"%package
         
-    ## @return bool True if \a package should be documented
+    ## @return bool True if \a package should be document
     def should_document(self, package):
         if not package in self.packages:
             return False
-        # ignore packages with invalid manifests
-        if not package in self.manifests:
-            return False
         # package filters override all 
         if self.package_filters:
             return package in self.package_filters
@@ -130,9 +127,7 @@ class RosdocContext(object):
         rd_configs = self.rd_configs
 
         stacks = self.stacks = {}
-
-        # keep track of packages with invalid manifests so we can unregister them
-        bad = []
+        
         for package, path in self.packages.iteritems():
 
             # find stacks to document on demand
@@ -175,10 +170,7 @@ class RosdocContext(object):
 
             except:
                 print >> sys.stderr, "WARN: Package '%s' does not have a valid manifest.xml file, manifest information will not be included in docs"%package
-                bad.append(package)
 
-        for b in bad:
-            del self.packages[b]
         stack_manifests = self.stack_manifests
         for stack, path in stacks.iteritems():