summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-22 12:53:56 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-25 14:57:17 +0100
commit72f04e760d99d6be99a82d8fd0efc0a136da3e7a (patch)
treec8ba81d522303061ef6ef939142ce5874343b781
parentbd3fd17fc57f4091308c3326c6ae29020e374da8 (diff)
downloadpoky-72f04e760d99d6be99a82d8fd0efc0a136da3e7a.tar.gz
bitbake: fetch2: Ensure star character doesn't end up in mirror tarball names
If '*' does end up in mirror urls accidently, some strange things can break since supports_checksum() looks for this, ud.localpath can then get ignored and this can lead to empty directories being downloaded "successfully". '*' is a special case for file urls only at this point so remove any entries that accidentlly make it in through url mapping. (Bitbake rev: 1369bec2404d942acc3618a8d005ec6868dcfd41) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/fetch2/__init__.py2
-rw-r--r--bitbake/lib/bb/fetch2/git.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index 844f24aa5e..a38cb8ffbe 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -492,7 +492,7 @@ def build_mirroruris(origud, mirrors, ld):
492 replacements["HOST"] = origud.host 492 replacements["HOST"] = origud.host
493 replacements["PATH"] = origud.path 493 replacements["PATH"] = origud.path
494 replacements["BASENAME"] = origud.path.split("/")[-1] 494 replacements["BASENAME"] = origud.path.split("/")[-1]
495 replacements["MIRRORNAME"] = origud.host.replace(':','.') + origud.path.replace('/', '.') 495 replacements["MIRRORNAME"] = origud.host.replace(':','.') + origud.path.replace('/', '.').replace('*', '.')
496 496
497 def adduri(uri, ud, uris, uds): 497 def adduri(uri, ud, uris, uds):
498 for line in mirrors: 498 for line in mirrors:
diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py
index 1c9a01cf33..3676cc3ddc 100644
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -130,7 +130,7 @@ class Git(FetchMethod):
130 ud.branches[name] = ud.revisions[name] 130 ud.branches[name] = ud.revisions[name]
131 ud.revisions[name] = self.latest_revision(ud.url, ud, d, name) 131 ud.revisions[name] = self.latest_revision(ud.url, ud, d, name)
132 132
133 gitsrcname = '%s%s' % (ud.host.replace(':','.'), ud.path.replace('/', '.')) 133 gitsrcname = '%s%s' % (ud.host.replace(':','.'), ud.path.replace('/', '.').replace('*', '.'))
134 # for rebaseable git repo, it is necessary to keep mirror tar ball 134 # for rebaseable git repo, it is necessary to keep mirror tar ball
135 # per revision, so that even the revision disappears from the 135 # per revision, so that even the revision disappears from the
136 # upstream repo in the future, the mirror will remain intact and still 136 # upstream repo in the future, the mirror will remain intact and still