base.bbclass/bitbake.conf: Fix some string quoting to handle more unusual URLs (from...

diff --git a/classes/base.bbclass b/classes/base.bbclass
index b191940..a54e699 100644 (file)
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -813,7 +813,7 @@ def oe_unpack_file(file, data, url = None):
                (type, host, path, user, pswd, parm) = bb.decodeurl(url)
                if 'dos' in parm:
                        cmd = '%s -a' % cmd
-               cmd = '%s %s' % (cmd, file)
+               cmd = "%s '%s'" % (cmd, file)
        elif os.path.isdir(file):
                destdir = "."
                filespath = bb.data.getVar("FILESPATH", data, 1).split(":")

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 1151f4c..0886587 100644 (file)
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -565,11 +565,11 @@ FETCHCMD_bzr = "/usr/bin/env bzr"
 FETCHCMD_hg = "/usr/bin/env hg"
 
 FETCHCOMMAND = "ERROR, this must be a BitBake bug"
-FETCHCOMMAND_wget = "/usr/bin/env 'PATH=${PATH}' wget -t 5 --passive-ftp --no-check-certificate -P ${DL_DIR} ${URI}"
+FETCHCOMMAND_wget = "/usr/bin/env 'PATH=${PATH}' wget -t 5 --passive-ftp --no-check-certificate -P ${DL_DIR} '${URI}'"
 FETCHCOMMAND_cvs = "/usr/bin/env 'PATH=${PATH}' cvs '-d${CVSROOT}' co ${CVSCOOPTS} ${CVSMODULE}"
 FETCHCOMMAND_svn = "/usr/bin/env svn co ${SVNCOOPTS} ${SVNROOT} ${SVNMODULE}"
 RESUMECOMMAND = "ERROR, this must be a BitBake bug"
-RESUMECOMMAND_wget = "/usr/bin/env 'PATH=${PATH}' wget -c -t 5 --passive-ftp --no-check-certificate -P ${DL_DIR} ${URI}"
+RESUMECOMMAND_wget = "/usr/bin/env 'PATH=${PATH}' wget -c -t 5 --passive-ftp --no-check-certificate -P ${DL_DIR} '${URI}'"
 UPDATECOMMAND = "ERROR, this must be a BitBake bug"
 UPDATECOMMAND_cvs = "/usr/bin/env 'PATH=${PATH}' cvs -d${CVSROOT} update -d -P ${CVSCOOPTS}"
 UPDATECOMMAND_svn = "/usr/bin/env svn update ${SVNCOOPTS}"