summaryrefslogtreecommitdiff
path: root/bitbake
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-04-27 12:53:36 +0000
committerRichard Purdie <richard@openedhand.com>2008-04-27 12:53:36 +0000
commitacc62fcec320aa6bd19a40e1b118fe2b8aad0a08 (patch)
tree9b53432e8670ebd8ec8b70f112042d6c72ef1de3 /bitbake
parentd10b26644bb398fc7d724320312f153861b892bf (diff)
downloadopenembedded-core-acc62fcec320aa6bd19a40e1b118fe2b8aad0a08.tar.gz
openembedded-core-acc62fcec320aa6bd19a40e1b118fe2b8aad0a08.tar.bz2
openembedded-core-acc62fcec320aa6bd19a40e1b118fe2b8aad0a08.zip
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
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/fetch/local.py3
-rw-r--r--bitbake/lib/bb/fetch/wget.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/bitbake/lib/bb/fetch/local.py b/bitbake/lib/bb/fetch/local.py
index a39cdce22f..54d598ae89 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 a5979dead8..739d5a1bc6 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)