diff options
| author | Richard Purdie <richard@openedhand.com> | 2007-11-13 23:03:21 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2007-11-13 23:03:21 +0000 |
| commit | e13102cd66ba59d5dde07ac0ec1e1fee1c7da21b (patch) | |
| tree | bc378b31ecec9cbec636eaca6fe0ea7b7cf112fe /bitbake/lib/bb/fetch/svn.py | |
| parent | 0fa37f2d05e4d9de2e9103c452aaee0e71705ef3 (diff) | |
| download | poky-e13102cd66ba59d5dde07ac0ec1e1fee1c7da21b.tar.gz | |
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
Diffstat (limited to 'bitbake/lib/bb/fetch/svn.py')
| -rw-r--r-- | bitbake/lib/bb/fetch/svn.py | 14 |
1 files changed, 8 insertions, 6 deletions
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): | |||
| 70 | if "DATE" in pv: | 70 | if "DATE" in pv: |
| 71 | ud.revision = "" | 71 | ud.revision = "" |
| 72 | else: | 72 | else: |
| 73 | rev = data.getVar("SRCREV", d, 1) | 73 | rev = Fetch.srcrev_internal_helper(ud, d) |
| 74 | if rev is "SRCREVINACTION": | 74 | if rev is True: |
| 75 | rev = self.latest_revision(url, ud, d) | 75 | ud.revision = self.latest_revision(url, ud, d) |
| 76 | if rev: | 76 | ud.date = "" |
| 77 | elif rev: | ||
| 77 | ud.revision = rev | 78 | ud.revision = rev |
| 78 | ud.date = "" | 79 | ud.date = "" |
| 79 | else: | 80 | else: |
| @@ -195,8 +196,9 @@ class Svn(Fetch): | |||
| 195 | def _sortable_revision(self, url, ud, d): | 196 | def _sortable_revision(self, url, ud, d): |
| 196 | """ | 197 | """ |
| 197 | Return a sortable revision number which in our case is the revision number | 198 | Return a sortable revision number which in our case is the revision number |
| 198 | (use the cached version to avoid network access) | ||
| 199 | """ | 199 | """ |
| 200 | 200 | ||
| 201 | return self.latest_revision(url, ud, d) | 201 | return self._build_revision(url, ud, d) |
| 202 | 202 | ||
| 203 | def _build_revision(self, url, ud, d): | ||
| 204 | return ud.revision | ||
