| 1 |
Author: zmedico |
| 2 |
Date: 2009-10-31 23:33:50 +0000 (Sat, 31 Oct 2009) |
| 3 |
New Revision: 14764 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.7/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. (trunk r14760) |
| 10 |
|
| 11 |
Modified: main/branches/2.1.7/bin/dohtml.py |
| 12 |
=================================================================== |
| 13 |
--- main/branches/2.1.7/bin/dohtml.py 2009-10-31 23:32:13 UTC (rev 14763) |
| 14 |
+++ main/branches/2.1.7/bin/dohtml.py 2009-10-31 23:33:50 UTC (rev 14764) |
| 15 |
@@ -176,14 +176,15 @@ |
| 16 |
dirname = os.path.dirname(x) |
| 17 |
success |= install(basename, dirname, options) |
| 18 |
|
| 19 |
- if success: |
| 20 |
+ global skipped_directories |
| 21 |
+ for x in skipped_directories: |
| 22 |
+ eqawarn(["QA Notice: dohtml on directory " + \ |
| 23 |
+ "'%s' without recursion option" % x]) |
| 24 |
+ |
| 25 |
+ if success and not skipped_directories: |
| 26 |
retcode = 0 |
| 27 |
else: |
| 28 |
retcode = 1 |
| 29 |
- global skipped_directories |
| 30 |
- for x in skipped_directories: |
| 31 |
- eqawarn(["QA Notice: dohtml on directory " + \ |
| 32 |
- "'%s' without recursion option" % x]) |
| 33 |
|
| 34 |
sys.exit(retcode) |
Archives