diff options
| author |   Jason Stubbs <jstubbs@gentoo.org> | 2005-10-11 12:46:33 +0000 |
|---|---|---|
| committer | Jason Stubbs <jstubbs@gentoo.org> | 2005-10-11 12:46:33 +0000 |
| commit | ab60dde101192da76b2d54fdaf5753703b235847 (patch) | |
| tree | e254dce7f6f2012ebdc0c6915bf62e507407598c /bin/ebuild | |
| parent | reset EBUILD_DEATH_HOOKS prior to sourcing, due to stable's re-sourcing of eb... (diff) | |
| download | portage-multirepo-ab60dde101192da76b2d54fdaf5753703b235847.tar.gz portage-multirepo-ab60dde101192da76b2d54fdaf5753703b235847.tar.bz2 portage-multirepo-ab60dde101192da76b2d54fdaf5753703b235847.zip | |
Set PORTDIR_OVERLAY (rather than PORTDIR) when portage wants to use a different ebuild.
(Yields the same behaviour when stuff isn't missing in the same tree and better behaviour when there is)
svn path=/main/branches/2.0/; revision=2124
Diffstat (limited to 'bin/ebuild')
| -rwxr-xr-x | bin/ebuild | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -37,10 +37,9 @@ cpv = "/".join(ebuild_split[-2:])[:-7] portage_ebuild = portage.portdb.findname(cpv) -if portage_ebuild != ebuild: - os.environ["PORTDIR"] = "/".join(ebuild_split[:-2]) - os.environ["PORTDIR_OVERLAY"] = "" - print "Adjusting PORTDIR to '%s'..." % os.environ["PORTDIR"] +if not portage_ebuild or os.path.abspath(portage_ebuild) != ebuild: + os.environ["PORTDIR_OVERLAY"] = "/".join(ebuild_split[:-2]) + print "Adjusting PORTDIR_OVERLAY to '%s'..." % os.environ["PORTDIR_OVERLAY"] reload(portage) |