Can this be merged?
Thanks,
Vijai Kumar K
On Friday, January 24, 2020 at 11:37:06 PM UTC+5:30, vijai kumar wrote:bb.build.FuncFailed is dropped from bitbake v1.43.1 onwards.
Replace the now obselete FuncFailed with bb.fatal.
Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
---
meta/classes/base.bbclass | 4 ++--
meta/classes/dpkg-base.bbclass | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index e233164..b7de921 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -171,7 +171,7 @@ python do_fetch() {
fetcher = bb.fetch2.Fetch(src_uri, d)
fetcher.download()
except bb.fetch2.BBFetchException as e:
- raise bb.build.FuncFailed(e)
+ bb.fatal(str(e))
}
addtask fetch before do_build
@@ -190,7 +190,7 @@ python do_unpack() {
fetcher = bb.fetch2.Fetch(src_uri, d)
fetcher.unpack(rootdir)
except bb.fetch2.BBFetchException as e:
- raise bb.build.FuncFailed(e)
+ bb.fatal(str(e))
}
addtask unpack after do_fetch before do_build
diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass
index af9c984..0589bf5 100644
--- a/meta/classes/dpkg-base.bbclass
+++ b/meta/classes/dpkg-base.bbclass
@@ -40,7 +40,7 @@ python do_adjust_git() {
if subprocess.call(cmd) != 0:
bb.fatal("git alternates adjustment failed")
except bb.fetch2.BBFetchException as e:
- raise bb.build.FuncFailed(e)
+ bb.fatal(str(e))
}
addtask adjust_git after do_unpack before do_patch
--
2.17.1