diff options
author | Yu Ke <ke.yu@intel.com> | 2010-12-27 09:31:38 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-10 23:36:27 +0000 |
commit | 99c81a1ae3ea5894d9c78caae30edda455ebce4f (patch) | |
tree | a2863b4ce9316e7797430b939a29010a4edc0966 /lib/bb/fetch2/svn.py | |
parent | c0475b7825381492c9ceaf7f5d9f77c4890a8534 (diff) | |
download | bitbake-99c81a1ae3ea5894d9c78caae30edda455ebce4f.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.
(From Poky rev: 1589a1172f9432aed1cc9ce006f68cddf3073774)
Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/bb/fetch2/svn.py')
-rw-r--r-- | lib/bb/fetch2/svn.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/lib/bb/fetch2/svn.py b/lib/bb/fetch2/svn.py index c0a7a548c..1116795e8 100644 --- a/lib/bb/fetch2/svn.py +++ b/lib/bb/fetch2/svn.py @@ -73,15 +73,9 @@ class Svn(Fetch): if "DATE" in pv: ud.revision = "" else: - rev = Fetch.srcrev_internal_helper(ud, d) - if rev is True: - ud.revision = self.latest_revision(url, ud, d) + # use the initizlied revision + if ud.revision: ud.date = "" - elif rev: - ud.revision = rev - ud.date = "" - else: - ud.revision = "" ud.localfile = data.expand('%s_%s_%s_%s_%s.tar.gz' % (ud.module.replace('/', '.'), ud.host, ud.path.replace('/', '.'), ud.revision, ud.date), d) |