Only show the eqawarn from bug #149745 when nothing is found to install. Also,

exit successfully unless nothing is found to install. (trunk r9484)

svn path=/main/branches/2.1.2/; revision=9562

diff --git a/bin/dohtml b/bin/dohtml
index 23d0292f4aef2bbcccd3ae81c7c75bc445194673..6162b0199ab1f208226d529be80771ae09478c48 100755 (executable)
--- a/bin/dohtml
+++ b/bin/dohtml
@@ -46,6 +46,8 @@ def eqawarn(lines):
                cmd += "eqawarn \"%s\" ; " % line
        os.spawnlp(os.P_WAIT, "bash", "bash", "-c", cmd)
 
+skipped_directories = []
+
 def install(basename, dirname, options, prefix=""):
        fullpath = basename
        if prefix:
@@ -70,8 +72,8 @@ def install(basename, dirname, options, prefix=""):
                        if prefix: pfx = prefix + "/" + pfx
                        install(i, dirname, options, pfx)
        elif not options.recurse and os.path.isdir(fullpath):
-               eqawarn(["QA Notice: dohtml on directory " + \
-                       "'%s' without recursion option" % fullpath])
+               global skipped_directories
+               skipped_directories.append(fullpath)
                return False
        else:
                return False
@@ -166,19 +168,22 @@ def main():
                print "Document prefix : '" + options.doc_prefix         + "'"
                print "Allowed files :", options.allowed_files
 
-       success = True
+       success = False
        
        for x in args:
                basename = os.path.basename(x)
                dirname  = os.path.dirname(x)
-               if not install(basename, dirname, options):
-                       success = False
-       
+               success |= install(basename, dirname, options)
+
        if success:
                retcode = 0
        else:
                retcode = 1
-       
+               global skipped_directories
+               for x in skipped_directories:
+                       eqawarn(["QA Notice: dohtml on directory " + \
+                               "'%s' without recursion option" % x])
+
        sys.exit(retcode)
 
 if __name__ == "__main__":