Bug #290921 - Always exit unsuccessfully if -r is not specified and a

directory is skipped. This reverts a behavior change from r9484. (trunk r14760)

svn path=/main/branches/2.1.7/; revision=14764

diff --git a/bin/dohtml.py b/bin/dohtml.py
index 71cbb62934a3738ea7fff6281f91fa5314faa0c9..84bc92f1051e56fcb14116af6790c074b630cc0f 100755 (executable)
--- a/bin/dohtml.py
+++ b/bin/dohtml.py
@@ -176,14 +176,15 @@ def main():
                dirname  = os.path.dirname(x)
                success |= install(basename, dirname, options)
 
-       if success:
+       global skipped_directories
+       for x in skipped_directories:
+               eqawarn(["QA Notice: dohtml on directory " + \
+                       "'%s' without recursion option" % x])
+
+       if success and not skipped_directories:
                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)