public inbox for gentoo-dev@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-dev] [PATCH] eclass/tests: Fix inheriting multiple eclasses
@ 2017-07-01 16:17 Michał Górny
  0 siblings, 0 replies; only message in thread
From: Michał Górny @ 2017-07-01 16:17 UTC (permalink / raw
  To: gentoo-dev; +Cc: Michał Górny

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.13.2



^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2017-07-01 16:22 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-01 16:17 [gentoo-dev] [PATCH] eclass/tests: Fix inheriting multiple eclasses Michał Górny

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox