From acc62fcec320aa6bd19a40e1b118fe2b8aad0a08 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 27 Apr 2008 12:53:36 +0000 Subject: 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 --- bitbake/lib/bb/fetch/local.py | 3 +++ bitbake/lib/bb/fetch/wget.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'bitbake/lib/bb/fetch') diff --git a/bitbake/lib/bb/fetch/local.py b/bitbake/lib/bb/fetch/local.py index a39cdce22..54d598ae8 100644 --- 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 a5979dead..739d5a1bc 100644 --- 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) -- cgit v1.2.3