summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-10-31 20:53:43 +0000
committerZac Medico <zmedico@gentoo.org>2009-10-31 20:53:43 +0000
commit4e9a6f8cdd4f72ac3a27278a0e730617a1594569 (patch)
tree30dba735edacad50c84eddfbf1106402bf7794ce
parent3d31b473743ff7c1f28540d06cac473e67e0a73b (diff)
downloadportage-4e9a6f8cdd4f72ac3a27278a0e730617a1594569.tar.gz
portage-4e9a6f8cdd4f72ac3a27278a0e730617a1594569.tar.bz2
portage-4e9a6f8cdd4f72ac3a27278a0e730617a1594569.zip
Bug #290921 - Always exit unsuccessfully if -r is not specified and a
directory is skipped. This reverts a behavior change from r9484. svn path=/main/trunk/; revision=14760
-rwxr-xr-xbin/dohtml.py11
1 files 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)