diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2011-11-01 19:17:19 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-11-01 19:17:19 -0700 |
| commit | 1af0c40b1300651ca03a7509f49f152c1e595736 (patch) | |
| tree | 6d967ae665bf98c9ba8219fb812a9678a127a57e /bin/dohtml.py | |
| parent | Merge install_qa_check_prefix from prefix branch. (diff) | |
| download | portage-1af0c40b1300651ca03a7509f49f152c1e595736.tar.gz portage-1af0c40b1300651ca03a7509f49f152c1e595736.tar.bz2 portage-1af0c40b1300651ca03a7509f49f152c1e595736.zip | |
Add EPREFIX and ED support in all ebuild helpers.
This allows our prefix tests to use helpers like insinto, doins, and dosym.
Diffstat (limited to 'bin/dohtml.py')
| -rwxr-xr-x | bin/dohtml.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/bin/dohtml.py b/bin/dohtml.py index 00258ec9e..122daf3f5 100755 --- a/bin/dohtml.py +++ b/bin/dohtml.py @@ -56,9 +56,9 @@ def install(basename, dirname, options, prefix=""): fullpath = dirname + "/" + fullpath if options.DOCDESTTREE: - destdir = options.D + "usr/share/doc/" + options.PF + "/" + options.DOCDESTTREE + "/" + options.doc_prefix + "/" + prefix + destdir = options.ED + "usr/share/doc/" + options.PF + "/" + options.DOCDESTTREE + "/" + options.doc_prefix + "/" + prefix else: - destdir = options.D + "usr/share/doc/" + options.PF + "/html/" + options.doc_prefix + "/" + prefix + destdir = options.ED + "usr/share/doc/" + options.PF + "/html/" + options.doc_prefix + "/" + prefix if not os.path.exists(fullpath): sys.stderr.write("!!! dohtml: %s does not exist\n" % fullpath) @@ -86,13 +86,15 @@ def install(basename, dirname, options, prefix=""): class OptionsClass: def __init__(self): self.PF = "" - self.D = "" + self.ED = "" self.DOCDESTTREE = "" if "PF" in os.environ: self.PF = os.environ["PF"] - if "D" in os.environ: - self.D = os.environ["D"] + if os.environ.get("EAPI", "0") in ("0", "1", "2"): + self.ED = os.environ.get("D", "") + else: + self.ED = os.environ.get("ED", "") if "_E_DOCDESTTREE_" in os.environ: self.DOCDESTTREE = os.environ["_E_DOCDESTTREE_"] |