diff options
Diffstat (limited to 'bitbake-dev/lib/bb')
| -rw-r--r-- | bitbake-dev/lib/bb/build.py | 3 | ||||
| -rw-r--r-- | bitbake-dev/lib/bb/fetch/cvs.py | 6 | ||||
| -rw-r--r-- | bitbake-dev/lib/bb/providers.py | 6 |
3 files changed, 12 insertions, 3 deletions
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): bb.msg.debug(1, bb.msg.domain.Build, "Executing task %s" % task) old_overrides = data.getVar('OVERRIDES', d, 0) localdata = data.createCopy(d) - data.setVar('OVERRIDES', 'task_%s:%s' % (task, old_overrides), localdata) + data.setVar('OVERRIDES', 'task-%s:%s' % (task[3:], old_overrides), localdata) data.update_data(localdata) + data.expandKeys(localdata) event.fire(TaskStarted(task, localdata)) exec_func(task, localdata) 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): if 'norecurse' in ud.parm: options.append("-l") if ud.date: - options.append("-D \"%s UTC\"" % ud.date) + # treat YYYYMMDDHHMM specially for CVS + if len(ud.date) == 12: + options.append("-D \"%s %s:%s UTC\"" % (ud.date[0:8], ud.date[8:10], ud.date[10:12])) + else: + options.append("-D \"%s UTC\"" % ud.date) if ud.tag: options.append("-r %s" % ud.tag) 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): # Only search dynamic packages if we can't find anything in other variables for pattern in dataCache.packages_dynamic: - regexp = re.compile(pattern) + try: + regexp = re.compile(pattern) + except: + bb.msg.error(bb.msg.domain.Provider, "Error parsing re expression: %s" % pattern) + raise if regexp.match(rdepend): rproviders += dataCache.packages_dynamic[pattern] |