diff options
author | Richard Purdie <richard@openedhand.com> | 2007-11-07 23:49:55 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2007-11-07 23:49:55 +0000 |
commit | e9b7bc6914c0f1d9282f92748eaa3d308f5d03fd (patch) | |
tree | 69129b5ebf7e9f8d36062ff200636b9367971905 /bitbake/lib/bb/fetch/bzr.py | |
parent | e7198e490325a95f1f5c301f76005e4333a08dad (diff) | |
download | poky-e9b7bc6914c0f1d9282f92748eaa3d308f5d03fd.tar.gz |
bitbake: fetcher updates - Add BB_GENERATE_MIRROR_TARBALLS option to allow disabling tarball creation to speedup git fetches, improve srcrev handling to remove some hacks and remove the need for external workarounds
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3101 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'bitbake/lib/bb/fetch/bzr.py')
-rw-r--r-- | bitbake/lib/bb/fetch/bzr.py | 12 |
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) |