diff options
author | Chris Larson <chris_larson@mentor.com> | 2010-04-11 17:03:55 -0700 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-02 15:41:33 +0100 |
commit | 1180bab54e2879401f3586c91a48174191a1ee8b (patch) | |
tree | a45aeee20eb5969cc1ac778fac47134929f4e021 /bitbake/lib/bb/cache.py | |
parent | 5b216c8000dbc3ed9f3e996242eb24269fcaf919 (diff) | |
download | poky-1180bab54e2879401f3586c91a48174191a1ee8b.tar.gz |
Apply some 2to3 transforms that don't cause issues in 2.6
(Bitbake rev: d39ab776e7ceaefc8361150151cf0892dcb70d9c)
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 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py index 0d165aec2f..6e124b2e83 100644 --- a/bitbake/lib/bb/cache.py +++ b/bitbake/lib/bb/cache.py | |||
@@ -61,7 +61,7 @@ class Cache: | |||
61 | return | 61 | return |
62 | 62 | ||
63 | self.has_cache = True | 63 | self.has_cache = True |
64 | self.cachefile = os.path.join(self.cachedir,"bb_cache.dat") | 64 | self.cachefile = os.path.join(self.cachedir, "bb_cache.dat") |
65 | 65 | ||
66 | bb.msg.debug(1, bb.msg.domain.Cache, "Using cache in '%s'" % self.cachedir) | 66 | bb.msg.debug(1, bb.msg.domain.Cache, "Using cache in '%s'" % self.cachedir) |
67 | try: | 67 | try: |
@@ -82,9 +82,9 @@ class Cache: | |||
82 | p = pickle.Unpickler(file(self.cachefile, "rb")) | 82 | p = pickle.Unpickler(file(self.cachefile, "rb")) |
83 | self.depends_cache, version_data = p.load() | 83 | self.depends_cache, version_data = p.load() |
84 | if version_data['CACHE_VER'] != __cache_version__: | 84 | if version_data['CACHE_VER'] != __cache_version__: |
85 | raise ValueError, 'Cache Version Mismatch' | 85 | raise ValueError('Cache Version Mismatch') |
86 | if version_data['BITBAKE_VER'] != bb.__version__: | 86 | if version_data['BITBAKE_VER'] != bb.__version__: |
87 | raise ValueError, 'Bitbake Version Mismatch' | 87 | raise ValueError('Bitbake Version Mismatch') |
88 | except EOFError: | 88 | except EOFError: |
89 | bb.msg.note(1, bb.msg.domain.Cache, "Truncated cache found, rebuilding...") | 89 | bb.msg.note(1, bb.msg.domain.Cache, "Truncated cache found, rebuilding...") |
90 | self.depends_cache = {} | 90 | self.depends_cache = {} |
@@ -446,7 +446,7 @@ class Cache: | |||
446 | self.getVar('__BB_DONT_CACHE', file_name, True) | 446 | self.getVar('__BB_DONT_CACHE', file_name, True) |
447 | self.getVar('__VARIANTS', file_name, True) | 447 | self.getVar('__VARIANTS', file_name, True) |
448 | 448 | ||
449 | def load_bbfile( self, bbfile , config): | 449 | def load_bbfile( self, bbfile, config): |
450 | """ | 450 | """ |
451 | Load and parse one .bb build file | 451 | Load and parse one .bb build file |
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 |