From 54e34f6e255d1717beada23638a5783c9dda42ea Mon Sep 17 00:00:00 2001 From: Yu Ke Date: Mon, 27 Dec 2010 09:50:25 +0800 Subject: bb.fetch2.git.py: add git urldata_init move the git specific urldata init from localpath to urldata_init so that it can be called early Signed-off-by: Yu Ke --- bitbake/lib/bb/fetch2/git.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py index e8ad3b43c..58ed1f410 100644 --- a/bitbake/lib/bb/fetch2/git.py +++ b/bitbake/lib/bb/fetch2/git.py @@ -41,8 +41,11 @@ class Git(Fetch): """ return ud.type in ['git'] - def localpath(self, url, ud, d): - + def urldata_init(self, ud, d): + """ + init git specific variable within url data + so that the git method like latest_revision() can work + """ if 'protocol' in ud.parm: ud.proto = ud.parm['protocol'] elif not ud.host: @@ -56,6 +59,10 @@ class Git(Fetch): ud.mirrortarball = 'git_%s.tar.gz' % (gitsrcname) ud.clonedir = os.path.join(data.expand('${GITDIR}', d), gitsrcname) + ud.basecmd = data.getVar("FETCHCMD_git", d, True) or "git" + + def localpath(self, url, ud, d): + tag = Fetch.srcrev_internal_helper(ud, d) if tag is True: ud.tag = self.latest_revision(url, ud, d) @@ -78,8 +85,6 @@ class Git(Fetch): else: ud.localfile = data.expand('git_%s%s_%s.tar.gz' % (ud.host, subdirpath.replace('/', '.'), ud.tag), d) - ud.basecmd = data.getVar("FETCHCMD_git", d, True) or "git" - if 'noclone' in ud.parm: ud.localfile = None return None -- cgit v1.2.3