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

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index d67579d9e5aa470a56424596fd33159ce3fa70bf..c6e19c150162f3e019c32ce69f6f7c9ae8385f16 100644 (file)
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -641,7 +641,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):
                filesdir = os.path.realpath(bb.data.getVar("FILESDIR", data, 1))
                destdir = "."

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index a7ab50baa7a5cb4d5c5aacce1829954df9cbda0f..6919649227ce15655a2bf49f0204d4a88c5dbf4d 100644 (file)
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -476,12 +476,12 @@ 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 wget -t 5 --passive-ftp -P ${DL_DIR} ${URI}"
+FETCHCOMMAND_wget = "/usr/bin/env wget -t 5 --passive-ftp -P ${DL_DIR} '${URI}'"
 FETCHCOMMAND_cvs = "/usr/bin/env cvs '-d${CVSROOT}' co ${CVSCOOPTS} ${CVSMODULE}"
 FETCHCOMMAND_svn = "/usr/bin/env svn co ${SVNCOOPTS} ${SVNROOT} ${SVNMODULE}"
 CHECKCOMMAND_wget = "/usr/bin/env wget --spider -t 5 --passive-ftp -P ${DL_DIR} ${URI}"
 RESUMECOMMAND = "ERROR, this must be a BitBake bug"
-RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 5 --passive-ftp -P ${DL_DIR} ${URI}"
+RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 5 --passive-ftp -P ${DL_DIR} '${URI}'"
 UPDATECOMMAND = "ERROR, this must be a BitBake bug"
 UPDATECOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} update -d -P ${CVSCOOPTS}"
 UPDATECOMMAND_svn = "/usr/bin/env svn update ${SVNCOOPTS}"