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 <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2011-04-19 23:31:09 +01:00
parent 029635eb78
commit 2d2d07275c
2 changed files with 10 additions and 6 deletions

View File

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

View File

@ -72,15 +72,16 @@ class Git(FetchMethod):
ud.basecmd = data.getVar("FETCHCMD_git", d, True) or "git"
ud.write_tarballs = (data.getVar("BB_GENERATE_MIRROR_TARBALLS", d, True) or "0") != "0"
ud.localfile = ud.clonedir
def fixuprevisions(self, ud, d):
for name in ud.names:
# Ensure anything that doesn't look like a sha256 checksum/revision is translated into one
if not ud.revisions[name] or len(ud.revisions[name]) != 40 or (False in [c in "abcdef0123456789" for c in ud.revisions[name]]):
ud.revisions[name] = self.latest_revision(ud.url, ud, d, name)
ud.write_tarballs = (data.getVar("BB_GENERATE_MIRROR_TARBALLS", d, True) or "0") != "0"
ud.localfile = ud.clonedir
def localpath(self, url, ud, d):
return ud.clonedir