diff options
-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 a3e98d1b50..9ed736b0e1 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass | |||
@@ -160,7 +160,7 @@ python base_do_fetch() { | |||
160 | fetcher = bb.fetch2.Fetch(src_uri, d) | 160 | fetcher = bb.fetch2.Fetch(src_uri, d) |
161 | fetcher.download() | 161 | fetcher.download() |
162 | except bb.fetch2.BBFetchException as e: | 162 | except bb.fetch2.BBFetchException as e: |
163 | bb.fatal(str(e)) | 163 | bb.fatal("Bitbake Fetcher Error: " + repr(e)) |
164 | } | 164 | } |
165 | 165 | ||
166 | addtask unpack after do_fetch | 166 | addtask unpack after do_fetch |
@@ -177,7 +177,7 @@ python base_do_unpack() { | |||
177 | fetcher = bb.fetch2.Fetch(src_uri, d) | 177 | fetcher = bb.fetch2.Fetch(src_uri, d) |
178 | fetcher.unpack(d.getVar('WORKDIR')) | 178 | fetcher.unpack(d.getVar('WORKDIR')) |
179 | except bb.fetch2.BBFetchException as e: | 179 | except bb.fetch2.BBFetchException as e: |
180 | bb.fatal(str(e)) | 180 | bb.fatal("Bitbake Fetcher Error: " + repr(e)) |
181 | } | 181 | } |
182 | 182 | ||
183 | def get_layers_branch_rev(d): | 183 | 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 dc423ec439..d4f6a08991 100644 --- a/meta/lib/oeqa/selftest/cases/bbtests.py +++ b/meta/lib/oeqa/selftest/cases/bbtests.py | |||
@@ -148,9 +148,6 @@ INHERIT_remove = \"report-error\" | |||
148 | self.delete_recipeinc('man-db') | 148 | self.delete_recipeinc('man-db') |
149 | self.assertEqual(result.status, 1, msg="Command succeded when it should have failed. bitbake output: %s" % result.output) | 149 | self.assertEqual(result.status, 1, msg="Command succeded when it should have failed. bitbake output: %s" % result.output) |
150 | self.assertIn('Fetcher failure: Unable to find file file://invalid anywhere. The paths that were searched were:', result.output) | 150 | self.assertIn('Fetcher failure: Unable to find file file://invalid anywhere. The paths that were searched were:', result.output) |
151 | line = self.getline(result, 'Fetcher failure for URL: \'file://invalid\'. Unable to fetch URL from any source.') | ||
152 | self.assertTrue(line and line.startswith("ERROR:"), msg = "\"invalid\" file \ | ||
153 | doesn't exist, yet fetcher didn't report any error. bitbake output: %s" % result.output) | ||
154 | 151 | ||
155 | def test_rename_downloaded_file(self): | 152 | def test_rename_downloaded_file(self): |
156 | # TODO unique dldir instead of using cleanall | 153 | # TODO unique dldir instead of using cleanall |