summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-09-30 15:22:44 +0000
committerRichard Purdie <richard@openedhand.com>2008-09-30 15:22:44 +0000
commitd54280dd315810ad8cdbce5c52a1af3de902f6ef (patch)
tree516f1a895d86f397388bd750059b9a5a69404277
parent4e522e0d4b9b7ee18678bd08c16548b807aa7229 (diff)
downloadpoky-d54280dd315810ad8cdbce5c52a1af3de902f6ef.tar.gz
bitbake-dev: Update against bitbake trunk
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5339 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--bitbake-dev/ChangeLog6
-rw-r--r--bitbake-dev/lib/bb/build.py3
-rw-r--r--bitbake-dev/lib/bb/fetch/cvs.py6
-rw-r--r--bitbake-dev/lib/bb/providers.py6
4 files changed, 18 insertions, 3 deletions
diff --git a/bitbake-dev/ChangeLog b/bitbake-dev/ChangeLog
index 1ee7fd363f..2ad0f713ff 100644
--- a/bitbake-dev/ChangeLog
+++ b/bitbake-dev/ChangeLog
@@ -137,6 +137,12 @@ Changes in Bitbake 1.9.x:
137 - Add PERSISTENT_DIR to store the PersistData in a persistent 137 - Add PERSISTENT_DIR to store the PersistData in a persistent
138 directory != the cache dir. 138 directory != the cache dir.
139 - Add md5 and sha256 checksum generation functions to utils.py 139 - Add md5 and sha256 checksum generation functions to utils.py
140 - Correctly handle '-' characters in class names (#2958)
141 - Make sure expandKeys has been called on the data dictonary before running tasks
142 - Correctly add a task override in the form task-TASKNAME.
143 - Revert the '-' character fix in class names since it breaks things
144 - When a regexp fails to compile for PACKAGES_DYNAMIC, print a more useful error (#4444)
145 - Allow to checkout CVS by Date and Time. Just add HHmm to the SRCDATE.
140 146
141Changes in Bitbake 1.8.0: 147Changes in Bitbake 1.8.0:
142 - Release 1.7.x as a stable series 148 - Release 1.7.x as a stable series
diff --git a/bitbake-dev/lib/bb/build.py b/bitbake-dev/lib/bb/build.py
index ca7cfbc6bb..b8abe6d1b4 100644
--- a/bitbake-dev/lib/bb/build.py
+++ b/bitbake-dev/lib/bb/build.py
@@ -267,8 +267,9 @@ def exec_task(task, d):
267 bb.msg.debug(1, bb.msg.domain.Build, "Executing task %s" % task) 267 bb.msg.debug(1, bb.msg.domain.Build, "Executing task %s" % task)
268 old_overrides = data.getVar('OVERRIDES', d, 0) 268 old_overrides = data.getVar('OVERRIDES', d, 0)
269 localdata = data.createCopy(d) 269 localdata = data.createCopy(d)
270 data.setVar('OVERRIDES', 'task_%s:%s' % (task, old_overrides), localdata) 270 data.setVar('OVERRIDES', 'task-%s:%s' % (task[3:], old_overrides), localdata)
271 data.update_data(localdata) 271 data.update_data(localdata)
272 data.expandKeys(localdata)
272 event.fire(TaskStarted(task, localdata)) 273 event.fire(TaskStarted(task, localdata))
273 exec_func(task, localdata) 274 exec_func(task, localdata)
274 event.fire(TaskSucceeded(task, localdata)) 275 event.fire(TaskSucceeded(task, localdata))
diff --git a/bitbake-dev/lib/bb/fetch/cvs.py b/bitbake-dev/lib/bb/fetch/cvs.py
index c4ccf4303f..aa55ad8bf6 100644
--- a/bitbake-dev/lib/bb/fetch/cvs.py
+++ b/bitbake-dev/lib/bb/fetch/cvs.py
@@ -118,7 +118,11 @@ class Cvs(Fetch):
118 if 'norecurse' in ud.parm: 118 if 'norecurse' in ud.parm:
119 options.append("-l") 119 options.append("-l")
120 if ud.date: 120 if ud.date:
121 options.append("-D \"%s UTC\"" % ud.date) 121 # treat YYYYMMDDHHMM specially for CVS
122 if len(ud.date) == 12:
123 options.append("-D \"%s %s:%s UTC\"" % (ud.date[0:8], ud.date[8:10], ud.date[10:12]))
124 else:
125 options.append("-D \"%s UTC\"" % ud.date)
122 if ud.tag: 126 if ud.tag:
123 options.append("-r %s" % ud.tag) 127 options.append("-r %s" % ud.tag)
124 128
diff --git a/bitbake-dev/lib/bb/providers.py b/bitbake-dev/lib/bb/providers.py
index 0ad5876ef0..63d4f5b3cb 100644
--- a/bitbake-dev/lib/bb/providers.py
+++ b/bitbake-dev/lib/bb/providers.py
@@ -296,7 +296,11 @@ def getRuntimeProviders(dataCache, rdepend):
296 296
297 # Only search dynamic packages if we can't find anything in other variables 297 # Only search dynamic packages if we can't find anything in other variables
298 for pattern in dataCache.packages_dynamic: 298 for pattern in dataCache.packages_dynamic:
299 regexp = re.compile(pattern) 299 try:
300 regexp = re.compile(pattern)
301 except:
302 bb.msg.error(bb.msg.domain.Provider, "Error parsing re expression: %s" % pattern)
303 raise
300 if regexp.match(rdepend): 304 if regexp.match(rdepend):
301 rproviders += dataCache.packages_dynamic[pattern] 305 rproviders += dataCache.packages_dynamic[pattern]
302 306