From 2d2d07275c8a2d652a221c1cd74d28c2f6f226d5 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 19 Apr 2011 23:31:09 +0100 Subject: bitbake/fetch2/git: Fix a bug where AUTOREV and the git fetcher interact badly Fix a bug where ud.branches were being referenced before it was set by the git fetcher when using AUTOREV. To do this some ordering needed to be changed. This fixes errors like: ERROR: Error parsing /recipes-kernel/linux/rt-tests_git.bb: Failure expanding variable SRCPV, expression was ${@bb.fetch2.get_srcrev(d)} which triggered exception AttributeError: 'FetchData' object has no attribute 'branches' Signed-off-by: Richard Purdie --- bitbake/lib/bb/fetch2/__init__.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'bitbake/lib/bb/fetch2/__init__.py') diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index 9fec705ad6..f53467e73b 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py @@ -555,6 +555,9 @@ class FetchData(object): if not self.method: raise NoMethodError(url) + if hasattr(self.method, "urldata_init"): + self.method.urldata_init(self, d) + if self.method.supports_srcrev(): self.revisions = {} for name in self.names: @@ -564,8 +567,8 @@ class FetchData(object): if len(self.names) == 1: self.revision = self.revisions[self.names[0]] - if hasattr(self.method, "urldata_init"): - self.method.urldata_init(self, d) + if hasattr(self.method, "fixuprevisions"): + self.method.fixuprevisions(self, d) if "localpath" in self.parm: # if user sets localpath for file, use it instead. -- cgit v1.2.3-54-g00ecf