diff options
| author |   Holger Hans Peter Freyther <zecke@selfish.org> | 2006-03-23 23:32:03 +0000 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2006-03-23 23:32:03 +0000 |
| commit | b2d4f4baa1e41026b858db2338b276aef7c754e1 (patch) | |
| tree | 3117e9ae7486b1919ec51b56f8dfee664c218fe8 | |
| parent | 8816a61bbec0e2349757ca80b274f65ed4669b9d (diff) | |
| download | bitbake-b2d4f4baa1e41026b858db2338b276aef7c754e1.tar.gz | |
bitbake/lib/bb/cache:
-Fix the method invocation in methodpool
to use the right amount of arguments
-Update data_smart to the new cache layout
of the file functions
| -rw-r--r-- | lib/bb/data_smart.py | 10 | ||||
| -rw-r--r-- | lib/bb/methodpool.py | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/bb/data_smart.py b/lib/bb/data_smart.py index 93a6acfc9..8b062ee57 100644 --- a/lib/bb/data_smart.py +++ b/lib/bb/data_smart.py @@ -29,7 +29,7 @@ Based on functions from the base bb module, Copyright 2003 Holger Schurig """ import copy, os, re, sys, time, types -from bb import note, debug, fatal, utils +from bb import note, debug, fatal, utils, methodpool try: import cPickle as pickle @@ -287,10 +287,10 @@ class DataSmartPackage(DataSmart): self.unpickle_prep() # compile the functions into global scope - funcstr = self.getVar('__functions__', 0) - if funcstr: - comp = utils.better_compile(funcstr, "<pickled>", self.bbfile) - utils.better_exec(comp, __builtins__, funcstr, self.bbfile) + funcs = self.getVar('__functions__', 0) or {} + for key in funcs.keys(): + methodpool.check_insert_method( key, funcs[key], self.bbfile ) + methodpool.parsed_module( key ) # now add the handlers which were present handlers = self.getVar('__all_handlers__', 0) or {} diff --git a/lib/bb/methodpool.py b/lib/bb/methodpool.py index 27bc4be0e..67cb626f2 100644 --- a/lib/bb/methodpool.py +++ b/lib/bb/methodpool.py @@ -65,7 +65,7 @@ def check_insert_method(modulename, code, fn): name will be used for that """ if not modulename in _parsed_methods: - return insert_method(modulename, code) + return insert_method(modulename, code, fn) def parsed_module(modulename): """ |