diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-11 22:56:29 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-13 13:41:32 +0100 |
commit | df1546952bf13ba9fb811daf1472caadfa03eb38 (patch) | |
tree | 1eb928f34c565e29143d48d98c908a1e6ca4678c | |
parent | 7d06ec193ee5f4c4910365981ccbfc717d87b573 (diff) | |
download | poky-df1546952bf13ba9fb811daf1472caadfa03eb38.tar.gz |
bitbake: contrib/dump_cache.py, cache: Fix to use python 3 syntax
Some tweaks to use python 3 syntax in a python 2 compatible way.
(Bitbake rev: 322949c77dbaa4db01b5a43d85b39a2af67ba7b2)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-x | bitbake/contrib/dump_cache.py | 4 | ||||
-rw-r--r-- | bitbake/lib/bb/cache.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/contrib/dump_cache.py b/bitbake/contrib/dump_cache.py index e1f23090b9..97c5463a09 100755 --- a/bitbake/contrib/dump_cache.py +++ b/bitbake/contrib/dump_cache.py | |||
@@ -36,7 +36,7 @@ def main(argv=None): | |||
36 | Get the mapping for the target recipe. | 36 | Get the mapping for the target recipe. |
37 | """ | 37 | """ |
38 | if len(argv) != 1: | 38 | if len(argv) != 1: |
39 | print >>sys.stderr, "Error, need one argument!" | 39 | print("Error, need one argument!", file=sys.stderr) |
40 | return 2 | 40 | return 2 |
41 | 41 | ||
42 | cachefile = argv[0] | 42 | cachefile = argv[0] |
@@ -56,7 +56,7 @@ def main(argv=None): | |||
56 | continue | 56 | continue |
57 | 57 | ||
58 | # 1.0 is the default version for a no PV recipe. | 58 | # 1.0 is the default version for a no PV recipe. |
59 | if val.__dict__.has_key("pv"): | 59 | if "pv" in val.__dict__: |
60 | pv = val.pv | 60 | pv = val.pv |
61 | else: | 61 | else: |
62 | pv = "1.0" | 62 | pv = "1.0" |
diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py index af5b9fbc62..742fe55cfe 100644 --- a/bitbake/lib/bb/cache.py +++ b/bitbake/lib/bb/cache.py | |||
@@ -339,7 +339,7 @@ class Cache(object): | |||
339 | value = pickled.load() | 339 | value = pickled.load() |
340 | except Exception: | 340 | except Exception: |
341 | break | 341 | break |
342 | if self.depends_cache.has_key(key): | 342 | if key in self.depends_cache: |
343 | self.depends_cache[key].append(value) | 343 | self.depends_cache[key].append(value) |
344 | else: | 344 | else: |
345 | self.depends_cache[key] = [value] | 345 | self.depends_cache[key] = [value] |