diff options
| author |   Chris Larson <clarson@kergoth.com> | 2003-06-26 03:38:49 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2003-06-26 03:38:49 +0000 |
| commit | c8833d31f4d2a4ad6509f122c0bcaebf5703694c (patch) | |
| tree | 3982083a2a36b136c97aff9ce98ec45767f60848 /bin/oe/parse/ConfHandler.py | |
| parent | cf5f65030a7b88bc996a38d762fcd4cd74ff2310 (diff) | |
| download | bitbake-contrib-c8833d31f4d2a4ad6509f122c0bcaebf5703694c.tar.gz | |
Move initial global conf var flag setup to the conf handler's init() function.
Diffstat (limited to 'bin/oe/parse/ConfHandler.py')
| -rw-r--r-- | bin/oe/parse/ConfHandler.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/bin/oe/parse/ConfHandler.py b/bin/oe/parse/ConfHandler.py index 4d2e3adae..c989f94e1 100644 --- a/bin/oe/parse/ConfHandler.py +++ b/bin/oe/parse/ConfHandler.py @@ -9,9 +9,16 @@ __config_regexp__ = re.compile( r"(?P<exp>export\s*)?(?P<var>\w+)\s*(?P<colon>: __include_regexp__ = re.compile( r"include\s+(.+)" ) def init(data): - oe.data.setVar('TOPDIR', os.getcwd(), data) - oe.data.setVar('OEDIR', os.path.join(sys.prefix, "share/oe"), data) - oe.data.setVar('OEPATH', "${OEDIR}/bin:${OEDIR}:${TOPDIR}/bin:${TOPDIR}", data) + if not oe.data.getVar('TOPDIR', data): + oe.data.setVar('TOPDIR', os.getcwd(), data) + if not oe.data.getVar('OEDIR', data): + oe.data.setVar('OEDIR', os.path.join(sys.prefix, "share/oe"), data) + if not oe.data.getVar('OEPATH', data): + oe.data.setVar('OEPATH', "${OEDIR}/bin:${OEDIR}:${TOPDIR}/bin:${TOPDIR}", data) + oe.data.setVarFlag("OEFILES", "inherit", "1", data) + oe.data.setVarFlag("OEDIR", "inherit", "1", data) + oe.data.setVarFlag("OEPATH", "inherit", "1", data) + oe.data.setVarFlag("PATH", "inherit", "1", data) def supports(fn): return fn[-5:] == ".conf" |