public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
* [PATCH] meta: Replace no longer available bb.build.FuncFailed
@ 2020-02-19  7:17 Jan Kiszka
  2020-02-19  7:38 ` vijai kumar
  0 siblings, 1 reply; 4+ messages in thread
From: Jan Kiszka @ 2020-02-19  7:17 UTC (permalink / raw)
  To: isar-users

From: Jan Kiszka <jan.kiszka@siemens.com>

Follow the pattern in oe-core and issue bb.fatal instead.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.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 e233164c..b7de921a 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 1decf587..5d2c161c 100644
--- a/meta/classes/dpkg-base.bbclass
+++ b/meta/classes/dpkg-base.bbclass
@@ -42,7 +42,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.16.4


-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2020-02-20 10:27 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-19  7:17 [PATCH] meta: Replace no longer available bb.build.FuncFailed Jan Kiszka
2020-02-19  7:38 ` vijai kumar
2020-02-19  7:39   ` Jan Kiszka
2020-02-20 10:27   ` Henning Schild

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox