diff options
| author |   Richard Purdie <rpurdie@linux.intel.com> | 2006-04-30 14:09:33 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2006-04-30 14:09:33 +0000 |
| commit | 7ca3f842880677676b98a7df26d1424d2246874a (patch) | |
| tree | 67d7fb7ba522a76636354b188e693a0958d95c93 | |
| parent | 66734d7a0d103957add7ad6705f971f3ee874156 (diff) | |
| download | bitbake-7ca3f842880677676b98a7df26d1424d2246874a.tar.gz | |
bitbake-1.4/lib/bb/fetch/__init__.py:
Attachment from http://bugs.openembedded.org/attachment.cgi?id=698&action=view
from bug #918 to fix "Allow multiple TARBALL_STASH entries"
| -rw-r--r-- | lib/bb/fetch/__init__.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/bb/fetch/__init__.py b/lib/bb/fetch/__init__.py index 23d09fc6b..ac698a0d1 100644 --- a/lib/bb/fetch/__init__.py +++ b/lib/bb/fetch/__init__.py @@ -171,11 +171,11 @@ class Fetch(object): pn = data.getVar('PN', d, True) src_tarball_stash = None if pn: - src_tarball_stash = data.getVar('SRC_TARBALL_STASH_%s' % pn, d, True) or data.getVar('CVS_TARBALL_STASH_%s' % pn, d, True) or data.getVar('SRC_TARBALL_STASH', d, True) or data.getVar('CVS_TARBALL_STASH', d, True) + src_tarball_stash = (data.getVar('SRC_TARBALL_STASH_%s' % pn, d, True) or data.getVar('CVS_TARBALL_STASH_%s' % pn, d, True) or data.getVar('SRC_TARBALL_STASH', d, True) or data.getVar('CVS_TARBALL_STASH', d, True) or "").split() - if src_tarball_stash: + for stash in src_tarball_stash: fetchcmd = data.getVar("FETCHCOMMAND_mirror", d, True) or data.getVar("FETCHCOMMAND_wget", d, True) - uri = src_tarball_stash + tarfn + uri = stash + tarfn bb.note("fetch " + uri) fetchcmd = fetchcmd.replace("${URI}", uri) ret = os.system(fetchcmd) |