[oe-commits] Denys Dmytriyenko : base.bbclass: fix base_get_scmbasepath() to look for recipes/ and fall back to packages/ while parsing BBFILES

[GIT User account]

Module: openembedded.git
Branch: fso/milestone5.5
Commit: 9ca67723c3b52c1ac85d28222b04af325cb15596
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=9ca67723c3b52c1ac85d28222b04af325cb15596

Author: Denys Dmytriyenko <denis at denix.org>
Date:   Mon Mar 16 18:36:22 2009 -0400

base.bbclass: fix base_get_scmbasepath() to look for recipes/ and fall back to packages/ while parsing BBFILES

Signed-off-by: Denys Dmytriyenko <denis at denix.org>
Acked-by: Mike Westerhof <mwester at dls.net>
Acked-by: Philip Balister <philip at balister.org>
Acked-by: Khem Raj <raj.khem at gmail.com>
Acked-by: Marcin Juszkiewicz <hrw at openembedded.org>
Acked-by: Koen Kooi <koen at openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>

---

 classes/base.bbclass |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/classes/base.bbclass b/classes/base.bbclass
index fca0edd..ff802e4 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -767,7 +767,13 @@ python base_do_unpack() {
 def base_get_scmbasepath(d):
 	import bb
 	path_to_bbfiles = bb.data.getVar( 'BBFILES', d, 1 ).split()
-	return path_to_bbfiles[0][:path_to_bbfiles[0].rindex( "packages" )]
+
+	try:
+		index = path_to_bbfiles[0].rindex( "recipes" )
+	except ValueError:
+		index = path_to_bbfiles[0].rindex( "packages" )
+
+	return path_to_bbfiles[0][:index]
 
 def base_get_metadata_monotone_branch(d):
 	monotone_branch = "<unknown>"