diff options
author | Chris Larson <chris_larson@mentor.com> | 2010-04-08 10:22:29 -0700 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-02 15:41:32 +0100 |
commit | 1c74fd768f8e4f5778411538b906cdcc22fe3f67 (patch) | |
tree | 3d3a5f1021276055f91322afa64a9eee53d3cc9f /bitbake/lib/bb/cache.py | |
parent | 7acc132cac873e60005516272473a55a8160b9c4 (diff) | |
download | poky-1c74fd768f8e4f5778411538b906cdcc22fe3f67.tar.gz |
Import fixups
(Bitbake rev: 4fa052f426e3205ebace713eaa22deddc0420e8a)
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib/bb/cache.py')
-rw-r--r-- | bitbake/lib/bb/cache.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py index 300acc5fc6..0d165aec2f 100644 --- a/bitbake/lib/bb/cache.py +++ b/bitbake/lib/bb/cache.py | |||
@@ -28,7 +28,7 @@ | |||
28 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | 28 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
29 | 29 | ||
30 | 30 | ||
31 | import os, re | 31 | import os |
32 | import bb.data | 32 | import bb.data |
33 | import bb.utils | 33 | import bb.utils |
34 | 34 | ||
@@ -452,14 +452,13 @@ class Cache: | |||
452 | Return the data and whether parsing resulted in the file being skipped | 452 | Return the data and whether parsing resulted in the file being skipped |
453 | """ | 453 | """ |
454 | 454 | ||
455 | import bb | 455 | from bb import data, parse |
456 | from bb import utils, data, parse, debug, event, fatal | ||
457 | 456 | ||
458 | # expand tmpdir to include this topdir | 457 | # expand tmpdir to include this topdir |
459 | data.setVar('TMPDIR', data.getVar('TMPDIR', config, 1) or "", config) | 458 | data.setVar('TMPDIR', data.getVar('TMPDIR', config, 1) or "", config) |
460 | bbfile_loc = os.path.abspath(os.path.dirname(bbfile)) | 459 | bbfile_loc = os.path.abspath(os.path.dirname(bbfile)) |
461 | oldpath = os.path.abspath(os.getcwd()) | 460 | oldpath = os.path.abspath(os.getcwd()) |
462 | if bb.parse.cached_mtime_noerror(bbfile_loc): | 461 | if parse.cached_mtime_noerror(bbfile_loc): |
463 | os.chdir(bbfile_loc) | 462 | os.chdir(bbfile_loc) |
464 | bb_data = data.init_db(config) | 463 | bb_data = data.init_db(config) |
465 | try: | 464 | try: |