diff options
| author |   Chris Larson <clarson@kergoth.com> | 2004-04-01 21:50:27 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-04-01 21:50:27 +0000 |
| commit | f6608580a6067ee0363245f267187e95610f7227 (patch) | |
| tree | 16d25ea4230883944a9e088da7c44b13e752c477 /bin/oe/parse | |
| parent | afa1228e39b190df1cdd604d2229f6a2c5b9c922 (diff) | |
| download | bitbake-f6608580a6067ee0363245f267187e95610f7227.tar.gz | |
BUGFIX: fix an incorrect automatic merge from bk.
Diffstat (limited to 'bin/oe/parse')
| -rw-r--r-- | bin/oe/parse/OEHandler.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/bin/oe/parse/OEHandler.py b/bin/oe/parse/OEHandler.py index 4738ff3e7..6821e056b 100644 --- a/bin/oe/parse/OEHandler.py +++ b/bin/oe/parse/OEHandler.py @@ -150,7 +150,6 @@ def feeder(lineno, s, fn, d): __body__.append('') data.setVar(__infunc__, '\n'.join(__body__), d) data.setVarFlag(__infunc__, "func", 1, d) - data.setVar(__infunc__, string.join(__body__, '\n'), d) if __infunc__ == "__anonymous": anonqueue = oe.data.getVar("__anonqueue", d) or [] anonitem = {} |