From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6795053263826714624 X-Received: by 2002:ac2:52a3:: with SMTP id r3mr12600889lfm.189.1582096625913; Tue, 18 Feb 2020 23:17:05 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:518f:: with SMTP id u15ls2213483lfi.3.gmail; Tue, 18 Feb 2020 23:17:04 -0800 (PST) X-Google-Smtp-Source: APXvYqy2Tw2iTJjEpSqZKPJsBcyhfWR/T2UO4hl/5BfJPj0OvJ+/01jOKsUb0ixZKNyrcO5eU3Qz X-Received: by 2002:ac2:5c4b:: with SMTP id s11mr12622923lfp.133.1582096624922; Tue, 18 Feb 2020 23:17:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582096624; cv=none; d=google.com; s=arc-20160816; b=KZA+w8dc95S+lARUWUbEGVL8T9EBTnNpttaCT69rnwSfoSdG8zvMKPn3ow3zZn2iXn khLWC+cRVt+6HktvAghvh0HhaJdYAG8sflH0ES0eMDNDcIPFeryKcgb0B2gnyXsHeYET FmiYTjvOJOzodEZLULos1nID3JKePj6kQMB53p+0yP3Y1lhAOtdPmpUob3GOb6bI6U6H 1tW6mglJ6dF7jLr83H/jhFtaJHgM20IvvgN9u97nKfpl2gDev//O5vWP8naAhiH140Ev wXUttZpmPA78AjKCYXB2yOofG+A1BrgiGe6vFKBIWsSJqbgjGhN/B45/AWn9N6u5PUVd fZ6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:mime-version:user-agent :date:message-id:to:subject:from; bh=clLVE/IsXaoPSJDMbwjkMLPH4kY95TWgEbwJoVvLoR4=; b=l2ib2PHnNzioOxQUzJk0LNXIzA6cTqM5PM1aYLvbZDCudKzC0xGd682YygKhSIxfjA TxAC61PYZ0jffZdXWSv0oT2Q9AqSoyPM9nJZuyMy4KYfvVV+dxWMPGdvgYGqbtzv6CFQ n7/BWKSi/Fh3DMX5X/Xi508iIauAyYm7ZW5AvQ85jt6HPnnMAWRFsieiLP7XCxkhyzKN JbcTvN4J8+P44hRI+aqNGvylyj0aES4+hKIWBRWNajU0sR+CVLnUCwJgUMXbvHN51K6j CJchNpMS4zBNfuNIZ4fZm3F3sYqTs4gRxgWGSRD4ouH5qqqGooGDTo2o2NUc8GSpffk1 rWJQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id a11si66763lff.0.2020.02.18.23.17.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Feb 2020 23:17:04 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 01J7H4gF006462 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 19 Feb 2020 08:17:04 +0100 Received: from [139.22.44.97] ([139.22.44.97]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 01J7H3Gc022316 for ; Wed, 19 Feb 2020 08:17:04 +0100 From: Jan Kiszka Subject: [PATCH] meta: Replace no longer available bb.build.FuncFailed To: isar-users Message-ID: <94d92943-ea75-bda6-1b07-56440856eb14@siemens.com> Date: Wed, 19 Feb 2020 08:17:03 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: bFPzFkGzS0Ge From: Jan Kiszka Follow the pattern in oe-core and issue bb.fatal instead. Signed-off-by: Jan Kiszka --- 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