mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-13 18:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

bitbake/fetchers: Sync with upstream bitbake

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3191 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2007-11-17 22:20:55 +00:00
parent dd45ce7f88
commit 688eca78c0
4 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
bitbake/lib/bb/fetch/bzr.py
View File

@@ -45,16 +45,14 @@ class Bzr(Fetch):
relpath = relpath[1:]
ud.pkgdir = os.path.join(data.expand('${BZRDIR}', d), ud.host, relpath)
if 'rev' in ud.parm:
ud.revision = ud.parm['rev']
else:
rev = data.getVar("SRCREV", d, 1)
if rev is "SRCREVINACTION":
rev = self.latest_revision(url, ud, d)
if rev:
ud.revision = rev
else:
ud.revision = ""
revision = Fetch.srcrev_internal_helper(ud, d)
if revision is True:
ud.revision = self.latest_revision(url, ud, d)
elif revision:
ud.revision = revision
if not ud.revision:
ud.revision = self.latest_revision(url, ud, d)
ud.localfile = data.expand('bzr_%s_%s_%s.tar.gz' % (ud.host, ud.path.replace('/', '.'), ud.revision), d)
@@ -147,7 +145,10 @@ class Bzr(Fetch):
def _sortable_revision(self, url, ud, d):
"""
Return a sortable revision number which in our case is the revision number
(use the cached version to avoid network access)
"""
return self.latest_revision(url, ud, d)
return self._build_revision(url, ud, d)
def _build_revision(self, url, ud, d):
return ud.revision