mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4354 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2008-04-27 12:53:36 +00:00
parent d10b26644b
commit acc62fcec3
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/lib/bb/fetch/local.py
+3
View File
@@ -64,6 +64,9 @@ class Local(Fetch):
""" """
Check the status of the url 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): if os.path.exists(urldata.localpath):
return True return True
return False return False
bitbake/lib/bb/fetch/wget.py
+1 -1
View File
@@ -53,7 +53,7 @@ class Wget(Fetch):
def fetch_uri(uri, ud, d): def fetch_uri(uri, ud, d):
if checkonly: 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): elif os.path.exists(ud.localpath):
# file exists, but we didnt complete it.. trying again.. # file exists, but we didnt complete it.. trying again..
fetchcmd = data.getVar("RESUMECOMMAND", d, 1) fetchcmd = data.getVar("RESUMECOMMAND", d, 1)
meta/conf/bitbake.conf
+1 -1
View File
@@ -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_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_cvs = "/usr/bin/env cvs '-d${CVSROOT}' co ${CVSCOOPTS} ${CVSMODULE}"
FETCHCOMMAND_svn = "/usr/bin/env svn co ${SVNCOOPTS} ${SVNROOT} ${SVNMODULE}" 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 = "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 = "ERROR, this must be a BitBake bug"