aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2008-08-16 23:13:21 +0100
committerAvatar David Leverton <levertond@googlemail.com> 2008-08-16 23:13:21 +0100
commit56777f2da961298152da4815a2055d4596adef21 (patch)
tree59893e6abc35884e486e24cee66b2835940270dc
parent9c6239c795c74eac52757fe3cc36a2f1d2db4040 (diff)
downloadpaludis-56777f2da961298152da4815a2055d4596adef21.tar.gz
paludis-56777f2da961298152da4815a2055d4596adef21.tar.xz
Fix inherit / require detection of missing eclasses / exlibs.
-rw-r--r--paludis/repositories/e/ebuild/0/eclass_functions.bash3
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/exlib_functions.bash3
2 files changed, 4 insertions, 2 deletions
diff --git a/paludis/repositories/e/ebuild/0/eclass_functions.bash b/paludis/repositories/e/ebuild/0/eclass_functions.bash
index 86a303d..d2b744d 100644
--- a/paludis/repositories/e/ebuild/0/eclass_functions.bash
+++ b/paludis/repositories/e/ebuild/0/eclass_functions.bash
@@ -37,8 +37,9 @@ inherit()
{
[[ -n "${PALUDIS_SKIP_INHERIT}" ]] && return
- local e ee location= v v_qa
+ local e ee location v v_qa
for e in "$@" ; do
+ location=
for ee in ${ECLASSDIRS:-${ECLASSDIR}} ; do
[[ -f "${ee}/${e}.eclass" ]] && location="${ee}/${e}.eclass"
done
diff --git a/paludis/repositories/e/ebuild/exheres-0/exlib_functions.bash b/paludis/repositories/e/ebuild/exheres-0/exlib_functions.bash
index 034ea8f..2cae338 100644
--- a/paludis/repositories/e/ebuild/exheres-0/exlib_functions.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/exlib_functions.bash
@@ -32,8 +32,9 @@ export_exlib_phases()
require()
{
ebuild_notice "debug" "Command 'require ${@}', using EXLIBSDIRS '${EXLIBSDIRS}'"
- local e ee location= v v_qa
+ local e ee location v v_qa
for e in "$@" ; do
+ location=
for ee in ${EXLIBSDIRS} ; do
[[ -f "${ee}/${e}.exlib" ]] && location="${ee}/${e}.exlib"
done