1 |
Author: zmedico |
2 |
Date: 2009-10-31 20:53:43 +0000 (Sat, 31 Oct 2009) |
3 |
New Revision: 14760 |
4 |
|
5 |
Modified: |
6 |
main/trunk/bin/dohtml.py |
7 |
Log: |
8 |
Bug #290921 - Always exit unsuccessfully if -r is not specified and a |
9 |
directory is skipped. This reverts a behavior change from r9484. |
10 |
|
11 |
|
12 |
Modified: main/trunk/bin/dohtml.py |
13 |
=================================================================== |
14 |
--- main/trunk/bin/dohtml.py 2009-10-31 19:44:18 UTC (rev 14759) |
15 |
+++ main/trunk/bin/dohtml.py 2009-10-31 20:53:43 UTC (rev 14760) |
16 |
@@ -176,14 +176,15 @@ |
17 |
dirname = os.path.dirname(x) |
18 |
success |= install(basename, dirname, options) |
19 |
|
20 |
- if success: |
21 |
+ global skipped_directories |
22 |
+ for x in skipped_directories: |
23 |
+ eqawarn(["QA Notice: dohtml on directory " + \ |
24 |
+ "'%s' without recursion option" % x]) |
25 |
+ |
26 |
+ if success and not skipped_directories: |
27 |
retcode = 0 |
28 |
else: |
29 |
retcode = 1 |
30 |
- global skipped_directories |
31 |
- for x in skipped_directories: |
32 |
- eqawarn(["QA Notice: dohtml on directory " + \ |
33 |
- "'%s' without recursion option" % x]) |
34 |
|
35 |
sys.exit(retcode) |