From 972eb5fababb33b5537fcfbbaf8e33ea820f0fee Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 3 Feb 2011 21:17:26 +0000 Subject: bitbake/fetch2: Move ud.localfile setup into urldata_init Signed-off-by: Richard Purdie --- bitbake/lib/bb/fetch2/hg.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'bitbake/lib/bb/fetch2/hg.py') diff --git a/bitbake/lib/bb/fetch2/hg.py b/bitbake/lib/bb/fetch2/hg.py index 13e9b8673b..53eeea9a89 100644 --- a/bitbake/lib/bb/fetch2/hg.py +++ b/bitbake/lib/bb/fetch2/hg.py @@ -57,18 +57,18 @@ class Hg(Fetch): ud.pkgdir = os.path.join(data.expand('${HGDIR}', d), ud.host, relpath) ud.moddir = os.path.join(ud.pkgdir, ud.module) - def forcefetch(self, url, ud, d): - revTag = ud.parm.get('rev', 'tip') - return revTag == "tip" - - def localpath(self, url, ud, d): if 'rev' in ud.parm: ud.revision = ud.parm['rev'] elif not ud.revision: - ud.revision = self.latest_revision(url, ud, d) + ud.revision = self.latest_revision(ud.url, ud, d) ud.localfile = data.expand('%s_%s_%s_%s.tar.gz' % (ud.module.replace('/', '.'), ud.host, ud.path.replace('/', '.'), ud.revision), d) + def forcefetch(self, url, ud, d): + revTag = ud.parm.get('rev', 'tip') + return revTag == "tip" + + def localpath(self, url, ud, d): return os.path.join(data.getVar("DL_DIR", d, True), ud.localfile) def _buildhgcommand(self, ud, d, command): -- cgit v1.2.3-54-g00ecf