diff options
| author |   Holger Schurig <schurig@mn-solutions.de> | 2004-01-22 22:24:08 +0000 |
|---|---|---|
| committer | Holger Schurig <schurig@mn-solutions.de> | 2004-01-22 22:24:08 +0000 |
| commit | d5ce4a91e1d9420dbce7e66ee84f5b5b3aef8a90 (patch) | |
| tree | 0ee047d1777da0e87d03211d6a46a16d3b9ce07e /bin/oe/parse | |
| parent | 788edc35c34a5e73074d655cc70cf68416d6c118 (diff) | |
| download | bitbake-d5ce4a91e1d9420dbce7e66ee84f5b5b3aef8a90.tar.gz | |
revert my enhancement
Diffstat (limited to 'bin/oe/parse')
| -rw-r--r-- | bin/oe/parse/ConfHandler.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/oe/parse/ConfHandler.py b/bin/oe/parse/ConfHandler.py index c94220697..cc80fb604 100644 --- a/bin/oe/parse/ConfHandler.py +++ b/bin/oe/parse/ConfHandler.py @@ -202,7 +202,7 @@ def obtain(fn, data = {}): return localfn -def include(oldfn, fn, orig_fn, orig_lineno, data = {}): +def include(oldfn, fn, data = {}): if oldfn == fn: # prevent infinate recursion return None @@ -214,7 +214,7 @@ def include(oldfn, fn, orig_fn, orig_lineno, data = {}): try: ret = handle(fn, data, 1) except IOError: - debug(2, "CONF %s:%d: file '%s' not found" % (orig_fn, orig_lineno, fn)) + debug(2, "CONF file '%s' not found" % fn) def handle(fn, data = {}, include = 0): if include: @@ -281,7 +281,7 @@ def feeder(lineno, s, fn, data = {}): s = oe.data.expand(m.group(1), data) #debug(2, "CONF %s:%d: including %s" % (fn, lineno, s)) oe.data.inheritFromOS(2, data) - include(fn, s, fn, lineno, data) + include(fn, s, data) return fatal("PARSER: %s:%d: unparsed line" % (fn, lineno)); |