summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/fetch2/svn.py
diff options
context:
space:
mode:
authorYu Ke <ke.yu@intel.com>2010-12-27 09:31:38 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-10 20:24:33 +0000
commit1589a1172f9432aed1cc9ce006f68cddf3073774 (patch)
tree48616149e847a09c87668f6342b64dce15f4f57f /bitbake/lib/bb/fetch2/svn.py
parent550c3bd82115b4bdb8235da53cfc18b1dc39ad96 (diff)
downloadpoky-1589a1172f9432aed1cc9ce006f68cddf3073774.tar.gz
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 <ke.yu@intel.com>
Diffstat (limited to 'bitbake/lib/bb/fetch2/svn.py')
-rw-r--r--bitbake/lib/bb/fetch2/svn.py10
1 files changed, 2 insertions, 8 deletions
diff --git a/bitbake/lib/bb/fetch2/svn.py b/bitbake/lib/bb/fetch2/svn.py
index c0a7a548cc..1116795e87 100644
--- a/bitbake/lib/bb/fetch2/svn.py
+++ b/bitbake/lib/bb/fetch2/svn.py
@@ -73,15 +73,9 @@ class Svn(Fetch):
73 if "DATE" in pv: 73 if "DATE" in pv:
74 ud.revision = "" 74 ud.revision = ""
75 else: 75 else:
76 rev = Fetch.srcrev_internal_helper(ud, d) 76 # use the initizlied revision
77 if rev is True: 77 if ud.revision:
78 ud.revision = self.latest_revision(url, ud, d)
79 ud.date = "" 78 ud.date = ""
80 elif rev:
81 ud.revision = rev
82 ud.date = ""
83 else:
84 ud.revision = ""
85 79
86 ud.localfile = data.expand('%s_%s_%s_%s_%s.tar.gz' % (ud.module.replace('/', '.'), ud.host, ud.path.replace('/', '.'), ud.revision, ud.date), d) 80 ud.localfile = data.expand('%s_%s_%s_%s_%s.tar.gz' % (ud.module.replace('/', '.'), ud.host, ud.path.replace('/', '.'), ud.revision, ud.date), d)
87 81