summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/fetch/bzr.py
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib/bb/fetch/bzr.py')
-rw-r--r--bitbake/lib/bb/fetch/bzr.py12
1 files changed, 5 insertions, 7 deletions
diff --git a/bitbake/lib/bb/fetch/bzr.py b/bitbake/lib/bb/fetch/bzr.py
index c66d17fdd2..76dde3a0bd 100644
--- a/bitbake/lib/bb/fetch/bzr.py
+++ b/bitbake/lib/bb/fetch/bzr.py
@@ -48,16 +48,14 @@ class Bzr(Fetch):
48 if 'rev' in ud.parm: 48 if 'rev' in ud.parm:
49 ud.revision = ud.parm['rev'] 49 ud.revision = ud.parm['rev']
50 else: 50 else:
51 # ***Nasty hack*** 51 rev = data.getVar("SRCREV", d, 1)
52 rev = data.getVar("SRCREV", d, 0) 52 if rev is "SRCREVINACTION":
53 if rev and "get_srcrev" in rev: 53 rev = self.latest_revision(url, ud, d)
54 ud.revision = self.latest_revision(url, ud, d) 54 if rev:
55 elif rev:
56 ud.revision = rev 55 ud.revision = rev
57 else: 56 else:
58 ud.revision = "" 57 ud.revision = ""
59 58
60
61 ud.localfile = data.expand('bzr_%s_%s_%s.tar.gz' % (ud.host, ud.path.replace('/', '.'), ud.revision), d) 59 ud.localfile = data.expand('bzr_%s_%s_%s.tar.gz' % (ud.host, ud.path.replace('/', '.'), ud.revision), d)
62 60
63 return os.path.join(data.getVar("DL_DIR", d, True), ud.localfile) 61 return os.path.join(data.getVar("DL_DIR", d, True), ud.localfile)