fetch2: Ensure star character doesn't end up in mirror tarball names

PATCH New Richard Purdie 1 participant 1 message Jun 22, 2012

Share & tools

Richard Purdie

author

2012-06-22 12:04 UTC #0 lore raw

PATCH 1/1 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.

Signed-off-by Richard Purdie <[email protected]>

---

bitbake/lib/bb/fetch2/__init__.py +1 -1

index e6f55f8..0b256ae 100644
@@ -492,7 +492,7 @@ def build_mirroruris(origud, mirrors, ld):
     replacements["HOST"] = origud.host
     replacements["PATH"] = origud.path
     replacements["BASENAME"] = origud.path.split("/")[-1]
-    replacements["MIRRORNAME"] = origud.host.replace(':','.') + origud.path.replace('/', '.')
+    replacements["MIRRORNAME"] = origud.host.replace(':','.') + origud.path.replace('/', '.').replace('*', '.')
 
     def adduri(uri, ud, uris, uds):
         for line in mirrors:

bitbake/lib/bb/fetch2/git.py +1 -1

index 1c9a01c..3676cc3 100644
@@ -130,7 +130,7 @@ class Git(FetchMethod):
                     ud.branches[name] = ud.revisions[name]
                 ud.revisions[name] = self.latest_revision(ud.url, ud, d, name)
 
-        gitsrcname = '%s%s' % (ud.host.replace(':','.'), ud.path.replace('/', '.'))
+        gitsrcname = '%s%s' % (ud.host.replace(':','.'), ud.path.replace('/', '.').replace('*', '.'))
         # for rebaseable git repo, it is necessary to keep mirror tar ball
         # per revision, so that even the revision disappears from the
         # upstream repo in the future, the mirror will remain intact and still