| 1 |
commit: 692442585cdb32cd8c59acab4289565614faf3b8 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 1 16:10:06 2017 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 8 19:42:16 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69244258 |
| 7 |
|
| 8 |
eclass/tests: Fix inheriting multiple eclasses |
| 9 |
|
| 10 |
Fix the inherit function to correctly handle 'inherit' call with |
| 11 |
multiple eclasses, instead of returning after the first eclass is |
| 12 |
successfully sourced. |
| 13 |
|
| 14 |
eclass/tests/tests-common.sh | 4 ++-- |
| 15 |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/eclass/tests/tests-common.sh b/eclass/tests/tests-common.sh |
| 18 |
index 8141425a0dc..d52cf3a2687 100644 |
| 19 |
--- a/eclass/tests/tests-common.sh |
| 20 |
+++ b/eclass/tests/tests-common.sh |
| 21 |
@@ -17,11 +17,11 @@ inherit() { |
| 22 |
local eclass=${path}/${e}.eclass |
| 23 |
if [[ -e "${eclass}" ]] ; then |
| 24 |
source "${eclass}" |
| 25 |
- return 0 |
| 26 |
+ continue 2 |
| 27 |
fi |
| 28 |
done |
| 29 |
+ die "could not find ${e}.eclass" |
| 30 |
done |
| 31 |
- die "could not find ${eclass}" |
| 32 |
} |
| 33 |
EXPORT_FUNCTIONS() { :; } |
Archives