bitbake: Tweak new URI checkstatus code slightly fixing two corner cases.

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4354 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/bitbake/lib/bb/fetch/local.py b/bitbake/lib/bb/fetch/local.py
index a39cdce22fcfa47a05e887e0d01c8e6917e967a8..54d598ae890025d789b6872f29f4d99144f9271a 100644 (file)
--- a/bitbake/lib/bb/fetch/local.py
+++ b/bitbake/lib/bb/fetch/local.py
@@ -64,6 +64,9 @@ class Local(Fetch):
         """
         Check the status of the url
         """
+        if urldata.localpath.find("*") != -1:
+            bb.msg.note(1, bb.msg.domain.Fetcher, "URL %s looks like a glob and was therefore not checked." % url)     
+           return True
         if os.path.exists(urldata.localpath):
            return True
         return False

diff --git a/bitbake/lib/bb/fetch/wget.py b/bitbake/lib/bb/fetch/wget.py
index a5979dead86d0ce04c59ff657f5b186713cb24f1..739d5a1bc6e2778e09d5630dc76301972188fb9b 100644 (file)
--- a/bitbake/lib/bb/fetch/wget.py
+++ b/bitbake/lib/bb/fetch/wget.py
@@ -53,7 +53,7 @@ class Wget(Fetch):
 
         def fetch_uri(uri, ud, d):
             if checkonly:
-                fetchcmd = data.getVar("FETCHCOMMAND", d, 1) + " " + data.getVar("FETCHOPTION_checkonly", d, 1)
+                fetchcmd = data.getVar("CHECKCOMMAND", d, 1)
             elif os.path.exists(ud.localpath):
                 # file exists, but we didnt complete it.. trying again..
                 fetchcmd = data.getVar("RESUMECOMMAND", d, 1)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index a90de9d9548e8b70efefa472f737888f8adfcb6c..4eca4296c80149b24c149bea038e2cfa9ea62995 100644 (file)
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -456,7 +456,7 @@ FETCHCOMMAND = "ERROR, this must be a BitBake bug"
 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}"
-FETCHOPTION_checkonly_wget = "--spider"
+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}"
 UPDATECOMMAND = "ERROR, this must be a BitBake bug"