diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2006-05-03 23:00:08 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-05-03 23:00:08 +0000 |
| commit | 866a2eaa0e298efafb59d4a8e5bd470af13007f3 (patch) | |
| tree | 768170399a2169f1db0e6c75835f0593ebdc616f /bin/ebuild.sh | |
| parent | Catch an uncaught CacheCorruption for the traceback from bug #126692. (diff) | |
| download | portage-multirepo-866a2eaa0e298efafb59d4a8e5bd470af13007f3.tar.gz portage-multirepo-866a2eaa0e298efafb59d4a8e5bd470af13007f3.tar.bz2 portage-multirepo-866a2eaa0e298efafb59d4a8e5bd470af13007f3.zip | |
Improve the error message when an eclass is not found and remove unnecesary ERRORMSG variable.
svn path=/main/trunk/; revision=3316
Diffstat (limited to 'bin/ebuild.sh')
| -rwxr-xr-x | bin/ebuild.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index d9f563a0..7450a104 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -1169,6 +1169,7 @@ inherit() { done fi debug-print "inherit: $1 -> $location" + [ ! -e "$location" ] && die "${1}.eclass could not be found by inherit()" #We need to back up the value of DEPEND and RDEPEND to B_DEPEND and B_RDEPEND #(if set).. and then restore them after the inherit call. @@ -1186,8 +1187,7 @@ inherit() { #turn on glob expansion set +f - source "$location" || export ERRORMSG="died sourcing $location in inherit()" - [ -z "${ERRORMSG}" ] || die "${ERRORMSG}" + source "$location" || die "died sourcing $location in inherit()" #turn off glob expansion set -f @@ -1435,7 +1435,6 @@ if ! hasq depend $EBUILD_PHASE; then RESTRICT="${PORTAGE_RESTRICT}" unset PORTAGE_RESTRICT fi -[ -z "${ERRORMSG}" ] || die "${ERRORMSG}" # Expand KEYWORDS # We need to turn off pathname expansion for -* in KEYWORDS and |