From e13102cd66ba59d5dde07ac0ec1e1fee1c7da21b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 13 Nov 2007 23:03:21 +0000 Subject: bitbake: Update SRCREV fetcher code to cope better with multiple SCM packages git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3145 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- bitbake/lib/bb/fetch/svn.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'bitbake/lib/bb/fetch/svn.py') diff --git a/bitbake/lib/bb/fetch/svn.py b/bitbake/lib/bb/fetch/svn.py index c3cebc390d..5e5b31b3ad 100644 --- a/bitbake/lib/bb/fetch/svn.py +++ b/bitbake/lib/bb/fetch/svn.py @@ -70,10 +70,11 @@ class Svn(Fetch): if "DATE" in pv: ud.revision = "" else: - rev = data.getVar("SRCREV", d, 1) - if rev is "SRCREVINACTION": - rev = self.latest_revision(url, ud, d) - if rev: + rev = Fetch.srcrev_internal_helper(ud, d) + if rev is True: + ud.revision = self.latest_revision(url, ud, d) + ud.date = "" + elif rev: ud.revision = rev ud.date = "" else: @@ -195,8 +196,9 @@ class Svn(Fetch): def _sortable_revision(self, url, ud, d): """ Return a sortable revision number which in our case is the revision number - (use the cached version to avoid network access) """ - return self.latest_revision(url, ud, d) + return self._build_revision(url, ud, d) + def _build_revision(self, url, ud, d): + return ud.revision -- cgit v1.2.3-54-g00ecf