summaryrefslogtreecommitdiffstats
path: root/bitbake-dev/lib/bb/fetch/__init__.py
diff options
context:
space:
mode:
authorJoshua Lock <josh@openedhand.com>2008-09-30 16:54:37 +0000
committerJoshua Lock <josh@openedhand.com>2008-09-30 16:54:37 +0000
commitcbaab65ff4bb3e4fc77066032a8858f4d5d61241 (patch)
tree393dcbb8a980e4d8c0c9d9db4eb3405e9c7f5f90 /bitbake-dev/lib/bb/fetch/__init__.py
parentd54280dd315810ad8cdbce5c52a1af3de902f6ef (diff)
downloadpoky-cbaab65ff4bb3e4fc77066032a8858f4d5d61241.tar.gz
Merge changes from Poky bitbake 1.8
Update bitbake-dev to have extra fixes from Poky's internal (1.8) version of bitbake. Should be able to use bitbake-dev with Poky now. git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5340 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'bitbake-dev/lib/bb/fetch/__init__.py')
-rw-r--r--bitbake-dev/lib/bb/fetch/__init__.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/bitbake-dev/lib/bb/fetch/__init__.py b/bitbake-dev/lib/bb/fetch/__init__.py
index c3bea447c1..721eb4d646 100644
--- a/bitbake-dev/lib/bb/fetch/__init__.py
+++ b/bitbake-dev/lib/bb/fetch/__init__.py
@@ -49,6 +49,9 @@ class ParameterError(Exception):
49class MD5SumError(Exception): 49class MD5SumError(Exception):
50 """Exception raised when a MD5SUM of a file does not match the expected one""" 50 """Exception raised when a MD5SUM of a file does not match the expected one"""
51 51
52class InvalidSRCREV(Exception):
53 """Exception raised when an invalid SRCREV is encountered"""
54
52def uri_replace(uri, uri_find, uri_replace, d): 55def uri_replace(uri, uri_find, uri_replace, d):
53# bb.msg.note(1, bb.msg.domain.Fetcher, "uri_replace: operating on %s" % uri) 56# bb.msg.note(1, bb.msg.domain.Fetcher, "uri_replace: operating on %s" % uri)
54 if not uri or not uri_find or not uri_replace: 57 if not uri or not uri_find or not uri_replace:
@@ -425,6 +428,8 @@ class Fetch(object):
425 rev = data.getVar("SRCREV_pn-" + pn + "_" + ud.parm['name'], d, 1) 428 rev = data.getVar("SRCREV_pn-" + pn + "_" + ud.parm['name'], d, 1)
426 if not rev: 429 if not rev:
427 rev = data.getVar("SRCREV", d, 1) 430 rev = data.getVar("SRCREV", d, 1)
431 if rev == "INVALID":
432 raise InvalidSRCREV("Please set SRCREV to a valid value")
428 if not rev: 433 if not rev:
429 return False 434 return False
430 if rev is "SRCREVINACTION": 435 if rev is "SRCREVINACTION":