From 692442585cdb32cd8c59acab4289565614faf3b8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sat, 1 Jul 2017 18:10:06 +0200 Subject: [PATCH] eclass/tests: Fix inheriting multiple eclasses Fix the inherit function to correctly handle 'inherit' call with multiple eclasses, instead of returning after the first eclass is successfully sourced. --- eclass/tests/tests-common.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eclass/tests/tests-common.sh b/eclass/tests/tests-common.sh index 8141425a0dcb..d52cf3a2687b 100644 --- a/eclass/tests/tests-common.sh +++ b/eclass/tests/tests-common.sh @@ -17,11 +17,11 @@ inherit() { local eclass=${path}/${e}.eclass if [[ -e "${eclass}" ]] ; then source "${eclass}" - return 0 + continue 2 fi done + die "could not find ${e}.eclass" done - die "could not find ${eclass}" } EXPORT_FUNCTIONS() { :; } -- 2.26.2