diff options
| author |   Chris Larson <clarson@kergoth.com> | 2004-05-18 19:22:26 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-05-18 19:22:26 +0000 |
| commit | 0c7b449fa9cfbef80be5bbf2b91796247fdaa45e (patch) | |
| tree | 94f959bfe01e9cfadc7e8a0d350ebb2787bac8b8 /bin/oe/make.py | |
| parent | 0ded6c7ba6ba27c1fc0d1c7c2adbeda673ebd15c (diff) | |
| download | bitbake-0c7b449fa9cfbef80be5bbf2b91796247fdaa45e.tar.gz | |
Bugfix in OEPATH mangling when loading a .oe's metadata. Previously the mangling was never undone, so the OEPATH grew to insane proportions, which made my xargs unhappy.
Diffstat (limited to 'bin/oe/make.py')
| -rw-r--r-- | bin/oe/make.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bin/oe/make.py b/bin/oe/make.py index 612e12dbd..e8a7a92fe 100644 --- a/bin/oe/make.py +++ b/bin/oe/make.py @@ -78,6 +78,7 @@ def load_oefile( oefile ): return cache_data oepath = data.getVar('OEPATH', cfg) + safeoepath = data.getVar('OEPATH', cfg) topdir = data.getVar('TOPDIR', cfg) if not topdir: topdir = os.path.abspath(os.getcwd()) @@ -88,12 +89,12 @@ def load_oefile( oefile ): # expand tmpdir to include this topdir data.setVar('TMPDIR', data.getVar('TMPDIR', cfg, 1) or "", cfg) # add topdir to oepath - oepath += ":%s" % topdir + oepath = "%s:%s" % (topdir, oepath) # set topdir to location of .oe file topdir = oefile_loc #data.setVar('TOPDIR', topdir, cfg) # add that topdir to oepath - oepath += ":%s" % topdir + oepath = "%s:%s" % (topdir, oepath) # go there oldpath = os.path.abspath(os.getcwd()) os.chdir(topdir) @@ -106,6 +107,7 @@ def load_oefile( oefile ): return oe finally: os.chdir(oldpath) + data.setVar('OEPATH', safeoepath, cfg) def pickle_oe( oefile, oe ): p = pickle.Pickler( file( "%s/%s" % ( cache, oefile ), "wb" ), -1 ) |