From 8a55738f54b7e9dd586b43d9ef9cd4b50fb62519 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 31 Oct 2009 23:33:50 +0000 Subject: 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 --- bin/dohtml.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/bin/dohtml.py b/bin/dohtml.py index 71cbb6293..84bc92f10 100755 --- 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) -- cgit v1.2.3-1-g7c22