From 1589a1172f9432aed1cc9ce006f68cddf3073774 Mon Sep 17 00:00:00 2001 From: Yu Ke Date: Mon, 27 Dec 2010 09:31:38 +0800 Subject: Fetcher: break the "SRCREVINACTION" deadlock Current fetcher has annoying "SRCREVINACTION" deadlock, which occurs when SRCREV=${AUTOREV}=@bb.fetch.get_srcrev(): get_srcrev()->setup_localpath()->srcrev_internal_helper() ->evaluate SRCREV->get_srcrev() current fetcher resolve the deadlock by introducing a "SRCREVINACTION" condition check. Althoguh it works, it is indeed not clean. This patch use antoehr idea to break the deadlock: break the dependency among SRCREV and get_srcrev(), i.e. assign a specific keyword "AUTOINC" to AUTOREV. when Fetcher meet this keyword, it will check and set the latest revision to urldata.revision. get_srcrev later can use the urldata.revision for value evaluation(SRCPV etc). In this case, SRCREV no longer depends on get_srcrev, and there is not deadlock anymore. Signed-off-by: Yu Ke --- bitbake/lib/bb/fetch2/bzr.py | 6 ------ 1 file changed, 6 deletions(-) (limited to 'bitbake/lib/bb/fetch2/bzr.py') diff --git a/bitbake/lib/bb/fetch2/bzr.py b/bitbake/lib/bb/fetch2/bzr.py index 1368f172d3..97b042b2a5 100644 --- a/bitbake/lib/bb/fetch2/bzr.py +++ b/bitbake/lib/bb/fetch2/bzr.py @@ -43,12 +43,6 @@ class Bzr(Fetch): ud.pkgdir = os.path.join(data.expand('${BZRDIR}', d), ud.host, relpath) def localpath (self, url, ud, d): - 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) -- cgit v1.2.3-54-g00ecf