From f28faca3377cd45bcd12d933103bf4f0ab0b7d03 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 28 Mar 2008 12:14:10 +0000 Subject: [PATCH] Bug #149745 - Generate an eqawarn message if dohtml is called on a directory without the recursive option. Thanks to brad walker for reporting. (trunk r9476) svn path=/main/branches/2.1.2/; revision=9558 --- bin/dohtml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/bin/dohtml b/bin/dohtml index 6aeb68ee5..23d0292f4 100755 --- a/bin/dohtml +++ b/bin/dohtml @@ -39,6 +39,13 @@ def dodir(path): def dofile(src,dst): os.spawnlp(os.P_WAIT, "install", "install", "-m0644", src, dst) +def eqawarn(lines): + cmd = "source '%s/isolated-functions.sh' ; " % \ + os.environ["PORTAGE_BIN_PATH"] + for line in lines: + cmd += "eqawarn \"%s\" ; " % line + os.spawnlp(os.P_WAIT, "bash", "bash", "-c", cmd) + def install(basename, dirname, options, prefix=""): fullpath = basename if prefix: @@ -62,6 +69,10 @@ def install(basename, dirname, options, prefix=""): pfx = basename if prefix: pfx = prefix + "/" + pfx install(i, dirname, options, pfx) + elif not options.recurse and os.path.isdir(fullpath): + eqawarn(["QA Notice: dohtml on directory " + \ + "'%s' without recursion option" % fullpath]) + return False else: return False return True -- 2.26.2