diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-09 23:33:15 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-14 22:31:55 +0100 |
| commit | c94816259cc1c09746353ad26ca0c811e0c962c2 (patch) | |
| tree | 281e6e55db54866f533cb2702f7a7219c34363d4 | |
| parent | 69376ac1a6147b26fe1abaa4cf68414024814d63 (diff) | |
| download | openembedded-core-contrib-c94816259cc1c09746353ad26ca0c811e0c962c2.tar.gz | |
base: Use repr() for printing exceptions
Exceptions print more clearly using repr() instead of str(), fix
in fetch and unpack tasks.
Drop part of the test which no longer makes sense after this change.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/base.bbclass | 4 | ||||
| -rw-r--r-- | meta/lib/oeqa/selftest/cases/bbtests.py | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index c0dddcf174..59fd46e5d4 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -160,7 +160,7 @@ python base_do_fetch() { fetcher = bb.fetch2.Fetch(src_uri, d) fetcher.download() except bb.fetch2.BBFetchException as e: - bb.fatal(str(e)) + bb.fatal("Bitbake Fetcher Error: " + repr(e)) } addtask unpack after do_fetch @@ -177,7 +177,7 @@ python base_do_unpack() { fetcher = bb.fetch2.Fetch(src_uri, d) fetcher.unpack(d.getVar('WORKDIR')) except bb.fetch2.BBFetchException as e: - bb.fatal(str(e)) + bb.fatal("Bitbake Fetcher Error: " + repr(e)) } def get_layers_branch_rev(d): diff --git a/meta/lib/oeqa/selftest/cases/bbtests.py b/meta/lib/oeqa/selftest/cases/bbtests.py index 6562364074..6779e62103 100644 --- a/meta/lib/oeqa/selftest/cases/bbtests.py +++ b/meta/lib/oeqa/selftest/cases/bbtests.py @@ -151,9 +151,6 @@ INHERIT:remove = \"report-error\" self.delete_recipeinc('man-db') self.assertEqual(result.status, 1, msg="Command succeded when it should have failed. bitbake output: %s" % result.output) self.assertIn('Fetcher failure: Unable to find file file://invalid anywhere. The paths that were searched were:', result.output) - line = self.getline(result, 'Fetcher failure for URL: \'file://invalid\'. Unable to fetch URL from any source.') - self.assertTrue(line and line.startswith("ERROR:"), msg = "\"invalid\" file \ -doesn't exist, yet fetcher didn't report any error. bitbake output: %s" % result.output) def test_rename_downloaded_file(self): # TODO unique dldir instead of using cleanall |