From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 31 Oct 2009 20:53:43 +0000 (-0000)
Subject: Bug #290921 - Always exit unsuccessfully if -r is not specified and a
X-Git-Tag: v2.2_rc48~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4e9a6f8cdd4f72ac3a27278a0e730617a1594569;p=portage.git

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
---

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)