diff options
author | Richard Purdie <richard@openedhand.com> | 2007-08-12 23:06:49 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2007-08-12 23:06:49 +0000 |
commit | ce800d3aea333919302a490838906983c18fe54d (patch) | |
tree | 14754c6d6de07f47a6f917b4d4d0e9bf52468beb /bitbake/lib/bb/fetch | |
parent | fc136f0b4c9f6c0bed18fb565f5c83d041abdd39 (diff) | |
download | openembedded-core-ce800d3aea333919302a490838906983c18fe54d.tar.gz openembedded-core-ce800d3aea333919302a490838906983c18fe54d.tar.bz2 openembedded-core-ce800d3aea333919302a490838906983c18fe54d.zip |
bitbake: Sync with upstream 1.8 branch for fixes
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2484 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'bitbake/lib/bb/fetch')
-rw-r--r-- | bitbake/lib/bb/fetch/__init__.py | 17 | ||||
-rw-r--r-- | bitbake/lib/bb/fetch/local.py | 4 |
2 files changed, 18 insertions, 3 deletions
diff --git a/bitbake/lib/bb/fetch/__init__.py b/bitbake/lib/bb/fetch/__init__.py index f739245bd1..229b28c19d 100644 --- a/bitbake/lib/bb/fetch/__init__.py +++ b/bitbake/lib/bb/fetch/__init__.py @@ -182,8 +182,21 @@ def get_srcrev(d): if len(scms) == 1: return urldata[scms[0]].method.sortable_revision(scms[0], urldata[scms[0]], d) - bb.msg.error(bb.msg.domain.Fetcher, "Sorry, support for SRCREV_FORMAT still needs to be written") - raise ParameterError + # + # Mutiple SCMs are in SRC_URI so we resort to SRCREV_FORMAT + # + format = bb.data.getVar('SRCREV_FORMAT', d, 1) + if not format: + bb.msg.error(bb.msg.domain.Fetcher, "The SRCREV_FORMAT variable must be set when multiple SCMs are used.") + raise ParameterError + + for scm in scms: + if 'name' in urldata[scm].parm: + name = urldata[scm].parm["name"] + rev = urldata[scm].method.sortable_revision(scm, urldata[scm], d) + format = format.replace(name, rev) + + return format def localpath(url, d, cache = True): """ diff --git a/bitbake/lib/bb/fetch/local.py b/bitbake/lib/bb/fetch/local.py index 9be8f1ce4b..5e480a208e 100644 --- a/bitbake/lib/bb/fetch/local.py +++ b/bitbake/lib/bb/fetch/local.py @@ -38,9 +38,11 @@ class Local(Fetch): return urldata.type in ['file','patch'] def localpath(self, url, urldata, d): - """Return the local filename of a given url assuming a successful fetch. + """ + Return the local filename of a given url assuming a successful fetch. """ path = url.split("://")[1] + path = path.split(";")[0] newpath = path if path[0] != "/": filespath = data.getVar('FILESPATH', d, 1) |