mirror of
https://git.yoctoproject.org/poky
synced 2026-04-21 03:32:12 +02:00
fetch2/local: Ensure quoting is handled correctly from the url
The commit 420eb112a4f (fetch2: quote/unquote url paths) caused a regression since local file urls containing quoted characters are no longer being handled correctly. This fixes things so the url is dequoted correctly, fixing various fetcher failures with recipes like "gtk+". [YOCTO #2558] (Bitbake rev: 95c0595d66b3f8a5f0716662ba2a878600f312ea) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -26,6 +26,7 @@ BitBake build tools.
|
||||
# Based on functions from the base bb module, Copyright 2003 Holger Schurig
|
||||
|
||||
import os
|
||||
import urllib
|
||||
import bb
|
||||
import bb.utils
|
||||
from bb import data
|
||||
@@ -40,7 +41,7 @@ class Local(FetchMethod):
|
||||
|
||||
def urldata_init(self, ud, d):
|
||||
# We don't set localfile as for this fetcher the file is already local!
|
||||
ud.basename = os.path.basename(ud.url.split("://")[1].split(";")[0])
|
||||
ud.basename = os.path.basename(urllib.unquote(ud.url.split("://")[1].split(";")[0]))
|
||||
return
|
||||
|
||||
def localpath(self, url, urldata, d):
|
||||
@@ -49,6 +50,7 @@ class Local(FetchMethod):
|
||||
"""
|
||||
path = url.split("://")[1]
|
||||
path = path.split(";")[0]
|
||||
path = urllib.unquote(path)
|
||||
newpath = path
|
||||
if path[0] != "/":
|
||||
filespath = data.getVar('FILESPATH', d, True)
|
||||
|
||||
Reference in New Issue
Block a user