diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-09 14:05:09 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-11 10:34:30 +0100 |
commit | 3795f4d6a69dc4ba5208f1d05b89e65bc11d8a10 (patch) | |
tree | 363978673f3e06a03bc2f4a3cb629dd5011cf40a /bitbake/bin | |
parent | a9d90f74050e2129171da09ca3427720887f67ee (diff) | |
download | openembedded-core-contrib-3795f4d6a69dc4ba5208f1d05b89e65bc11d8a10.tar.gz |
bitbake: bin, toaster: Fix print and exception syntax
This updates the print "" syntax to print() and fixes some exception
handling syntax such that its compatible with python v2 and v3.
(Bitbake rev: 58304fcce9727fd89564436771356c033ecd22a3)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/bin')
-rwxr-xr-x | bitbake/bin/bitbake-diffsigs | 6 | ||||
-rwxr-xr-x | bitbake/bin/bitbake-dumpsig | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/bitbake/bin/bitbake-diffsigs b/bitbake/bin/bitbake-diffsigs index 196f0b73e8..67c60dbb00 100755 --- a/bitbake/bin/bitbake-diffsigs +++ b/bitbake/bin/bitbake-diffsigs @@ -95,7 +95,7 @@ def find_compare_task(bbhandler, pn, taskname): # Recurse into signature comparison output = bb.siggen.compare_sigfiles(latestfiles[0], latestfiles[1], recursecb) if output: - print '\n'.join(output) + print('\n'.join(output)) sys.exit(0) @@ -130,9 +130,9 @@ else: except IOError as e: logger.error(str(e)) sys.exit(1) - except cPickle.UnpicklingError, EOFError: + except (pickle.UnpicklingError, EOFError): logger.error('Invalid signature data - ensure you are specifying sigdata/siginfo files') sys.exit(1) if output: - print '\n'.join(output) + print('\n'.join(output)) diff --git a/bitbake/bin/bitbake-dumpsig b/bitbake/bin/bitbake-dumpsig index 656d93a5ac..ffaed1f457 100755 --- a/bitbake/bin/bitbake-dumpsig +++ b/bitbake/bin/bitbake-dumpsig @@ -57,9 +57,9 @@ else: except IOError as e: logger.error(str(e)) sys.exit(1) - except cPickle.UnpicklingError, EOFError: + except (pickle.UnpicklingError, EOFError): logger.error('Invalid signature data - ensure you are specifying a sigdata/siginfo file') sys.exit(1) if output: - print '\n'.join(output) + print('\n'.join(output)) |