| 1 |
Author: zmedico |
| 2 |
Date: 2008-03-28 12:14:10 +0000 (Fri, 28 Mar 2008) |
| 3 |
New Revision: 9558 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/dohtml |
| 7 |
Log: |
| 8 |
Bug #149745 - Generate an eqawarn message if dohtml is called on a directory |
| 9 |
without the recursive option. Thanks to brad walker <bradmwalker@××××××××.net> |
| 10 |
for reporting. (trunk r9476) |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/branches/2.1.2/bin/dohtml |
| 14 |
=================================================================== |
| 15 |
--- main/branches/2.1.2/bin/dohtml 2008-03-28 12:10:37 UTC (rev 9557) |
| 16 |
+++ main/branches/2.1.2/bin/dohtml 2008-03-28 12:14:10 UTC (rev 9558) |
| 17 |
@@ -39,6 +39,13 @@ |
| 18 |
def dofile(src,dst): |
| 19 |
os.spawnlp(os.P_WAIT, "install", "install", "-m0644", src, dst) |
| 20 |
|
| 21 |
+def eqawarn(lines): |
| 22 |
+ cmd = "source '%s/isolated-functions.sh' ; " % \ |
| 23 |
+ os.environ["PORTAGE_BIN_PATH"] |
| 24 |
+ for line in lines: |
| 25 |
+ cmd += "eqawarn \"%s\" ; " % line |
| 26 |
+ os.spawnlp(os.P_WAIT, "bash", "bash", "-c", cmd) |
| 27 |
+ |
| 28 |
def install(basename, dirname, options, prefix=""): |
| 29 |
fullpath = basename |
| 30 |
if prefix: |
| 31 |
@@ -62,6 +69,10 @@ |
| 32 |
pfx = basename |
| 33 |
if prefix: pfx = prefix + "/" + pfx |
| 34 |
install(i, dirname, options, pfx) |
| 35 |
+ elif not options.recurse and os.path.isdir(fullpath): |
| 36 |
+ eqawarn(["QA Notice: dohtml on directory " + \ |
| 37 |
+ "'%s' without recursion option" % fullpath]) |
| 38 |
+ return False |
| 39 |
else: |
| 40 |
return False |
| 41 |
return True |
| 42 |
|
| 43 |
-- |
| 44 |
gentoo-commits@l.g.o mailing list |
Archives