From patchwork Mon Jul 18 22:16:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schmidt, Adriaan" X-Patchwork-Id: 1990 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 19 Jul 2022 08:16:57 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-io1-f60.google.com (mail-io1-f60.google.com [209.85.166.60]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 26J6GteT013792 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 19 Jul 2022 08:16:56 +0200 Received: by mail-io1-f60.google.com with SMTP id u10-20020a6be30a000000b0067bcbb8a637sf6326647ioc.3 for ; Mon, 18 Jul 2022 23:16:56 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1658211410; cv=pass; d=google.com; s=arc-20160816; b=zd42S/ZdnSS3j6qFEcOnlS66OTCgsu3V4tElW6YnVwno4UiyqPJERYa9SZTAnfmZEf rB4dvhWujYqyA9RmdFVjr3fNo2ZfB+sGP0nDrrbspAPbpT+Z4MdKulDX9MnksgRPA7Wp aKFxsw1RBnRfTlL93BHpCj1Q45cG6vpvlQFpzPm+5HzxbygWdZau1vrmqJps37i36Zhu rrTIwJHgZoq600i56vGwQ4+yO9BbpHvKUa5f0CRqVh/TGCI8gx6CQ8UsjdyHTtvRNydv Usl9J2v1UjxtzqrAz7+rPWYDFZjXzryvnb80vRtm6m4u6obfcv+WmDwsx4O0vxRsOMF4 5wsA== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=Q61U9rfNAUpob7A8OJZ9EH6F9aXDUgOFBvrsBEbp81w=; b=pyIvOUDafJ+BlsO1kitDv7XM6QgtIiH0E+uTR0AJWV2DRWMeH64+yMvZjZBcNGAuW7 3HSwXZF76/S07stV5xwLl2FVDndznbFJqpUbaOPWorN7FKsz4FfI1NFiSX2tzf+hZKki UlO0kxG1U3+fESSBGEFZXkSt95f2uOeAcWL7M9PcQEnHrraqir6IEcQDpoXPEiLlQ6g6 92kQqCiCHU0iIZVVxDlUc+GE67sUpo5Ifu/O/p7LlxglLrcEBBZNsXAsH62cf+Ta6KZX VesQIwqq92wDPM0tLAU9giR6++8pq/lR6jNDBF53U8WC2lC8mkTwg8c+vG6x5qqKu68L y8zg== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=ARctPyxV; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 40.107.8.43 as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=Q61U9rfNAUpob7A8OJZ9EH6F9aXDUgOFBvrsBEbp81w=; b=kCIDq0vzbORywfm5pRErpb0rWZrVHu8+Ghwgfsi6cLxOm3wFsifZ8IRMZTsuzoRNdc gT2us59J34RpGCatQeC+7tDXMKAEKP9RAUe6EuEN7KRPKQCsTe87s6vyxOHZYfoVIcUv xmOTUwRBlttlgmspJbbb6MlUg1iApqwthv1vV/TLwzTjIaeOUBv0U3mo6Eo9aW1d9Fp4 x3dr/joQdUUNoyS18rBqJwhF9BYTHwUzG8Jnb6UTRABZuhEVlXTKQS57MbKmyvwYL6Hn oXri+qalFUG24LanvJTfG8KY9fktVPp52aT+Smydil3Ua7kK8d+RRTI1uyOZVzxHpbZJ doAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=Q61U9rfNAUpob7A8OJZ9EH6F9aXDUgOFBvrsBEbp81w=; b=36NnIPd5yOOJlJCW7VuLk4fr/Ljy7KV5UWgkA4NjCbLkArQwPnAFYI7xWcAsYtcNzx efkInSF6PDgDMzglWDtbOB2sXk6E5/r3nDoF9roGfjevG5hAF3boGDRrrFkhzZAoKNXu yjQSRXNRJV7kBLTcjXElsp24rjLPYTwMaxJWfSb590oCrtYa2hMRpOMeBR84E0PZDwxf OcdTEQ4G9yaNV90rp5rG6GPDXrfL+tCXh5TnUjSWUnlY+HkHLPbkxIkLtNkFWRltdJbh qBqxLOOrxSqk8JoZ5K9NOjT0yWxdLc6aMLHciZoymGebz6W08Yg6+THDdRhsv6vnheZ0 AdFg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AJIora9fMtuFOo9eeUCqITigPZi+2XqzyYS1sZXISLlGJsAcIIlwWZCP 7p0JUduLTueQG2uI79s3B0s= X-Google-Smtp-Source: AGRyM1tTVnj5oVe174t3mJyPSYoHg5cBtx2qfl+Dk1V04ldJu8VvMJ4v3ss3tiMAIQp0CGfOfp071Q== X-Received: by 2002:a05:6638:379b:b0:33f:6a8f:cd22 with SMTP id w27-20020a056638379b00b0033f6a8fcd22mr16250490jal.102.1658211409867; Mon, 18 Jul 2022 23:16:49 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6602:3402:b0:67c:2a0a:4287 with SMTP id n2-20020a056602340200b0067c2a0a4287ls137885ioz.3.gmail; Mon, 18 Jul 2022 23:16:49 -0700 (PDT) X-Received: by 2002:a6b:b40c:0:b0:67b:e564:f977 with SMTP id d12-20020a6bb40c000000b0067be564f977mr8714414iof.130.1658211409346; Mon, 18 Jul 2022 23:16:49 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1658211409; cv=pass; d=google.com; s=arc-20160816; b=EW6DSjGN4KHkv6x7skCdColk00rt0Vl+lsxGVzvgASxkyf/1bQFA9R+2Ov3l6q4Exk Px7WeiNUBbKz+mIfN8JhqVeouTO1oHDRLv5OtjXlID6uwj+9qzhZTvzbkadvZY7Y8IE6 M3rGVNbt+o6YnhklZK2fR0vbdx6olTJV+xlBh6Edq+9WJDBfPzqwCrtQDAe/wmQXBsow t1aOMOo+QLNJZpDFY642jW9IyP7DlnsztFD2QD1QhAQyTCK8pjKmlKRt8T2AMvigw1Rh l9gPOCfbX0iIvEJFXXg0M/MqA+jEJI50ouDWj6d7L7WVkaIsp7Qn2RCXLwIo2HBABTJi e9iQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=pN4TUJ8PqkXYpR9AJxQqajXgo9bc/saWQsMQrRlJXBE=; b=E3lpTsTaf6AOfLOToqElPNN/e+iHjbNT8j6S7cpEYaab8ziEVu+ow9OFjKY6pT1Vej KaCI3ba7xNX783te+6fgI+qqmnLaCd96k/5yh++91uY8ZptBtkSgnM4MDmH9VogpvW5+ RzsQOi+ayNDUatTpCAvAgYbmbPAi8l/jrXpqyBxoHvW+ohfRCBn4I/GpYzhIAmLOmmj4 yUfPCuTF3/ipxNjFftb9H9E1aplOuOS4huwTs/vYPATx8g///Xxkx0mimiWEQ6Wnrqon qL6oY8ppgnaPii9popwzln+E9RT++34+ZoG2yiktkQzr4cZPxF3+QnsNM+it/R5c8VNf WpnA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=ARctPyxV; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 40.107.8.43 as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80043.outbound.protection.outlook.com. [40.107.8.43]) by gmr-mx.google.com with ESMTPS id i13-20020a02ca0d000000b0033ecc2a8230si679320jak.6.2022.07.18.23.16.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Jul 2022 23:16:49 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 40.107.8.43 as permitted sender) client-ip=40.107.8.43; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JWZ34GDossVRr/GY/AILkxWURsZDKLiJheNofjr9PTDbOdKL/ali1F7sUQkvEaC4saM8zah5VlTEC+sgMbRiDZtJ+nK7WBJv0f6zUq2F0QjXstSc6rhMV8BeshMTu/4Cwfk8BoxaUNbrtWlzh8useDRgvxNOl5LMNXL19/c5g3Y64+a+Jfb0zktCIDlBKR4THfsfzS73OUG794zoutR9Qtf31yxaLtNtlU4z4QAAxxKxi4h6Nslz2hNTTe10kWHwabSJrEDrlxx3ntoJOysDRX2QWI+GnA1jZKv2DAM4+Qp/my68iSky/KhH9QPEdr2//vf2LEgE+vWWncyc1Nf2Mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=pN4TUJ8PqkXYpR9AJxQqajXgo9bc/saWQsMQrRlJXBE=; b=Wojoc9m87zmdYUZWamoJ/b48vzwEOr30VVxuhAnEORbkR3xIkAcG3Ufngjp/JN884DapZ6lYLFj+BI0fvEijozQvc3ZaUBeBa/QYC13cUJqoWcNBzvaHKm4Qs7Ti7g0/6nvhniKCeiZyN0prxR/lb3BffO7rNnIRRuAqz+20z2Sg9DJ8uv6TyOlvT1lSoPGe/UQOcDXbneZuerO7YGCDU+8/6N/stE5laxc5m/UXRShzR/HmTv1wYCCY1zVDiXSr1ymXhWKyffH5Pm0ZgIfCCb7IW9mhPZz7bb3GYqwyZHU7x3Ywu+0m94GlsrPEhRbd4efcyIaO0eJ20EUKGBvFAg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.70) smtp.rcpttodomain=googlegroups.com smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none Received: from DB8PR03CA0031.eurprd03.prod.outlook.com (2603:10a6:10:be::44) by VI1PR10MB3599.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:800:140::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.15; Tue, 19 Jul 2022 06:16:44 +0000 Received: from DB5EUR01FT065.eop-EUR01.prod.protection.outlook.com (2603:10a6:10:be:cafe::99) by DB8PR03CA0031.outlook.office365.com (2603:10a6:10:be::44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.23 via Frontend Transport; Tue, 19 Jul 2022 06:16:43 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.70) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.70 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.70; helo=hybrid.siemens.com; pr=C Received: from hybrid.siemens.com (194.138.21.70) by DB5EUR01FT065.mail.protection.outlook.com (10.152.5.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.12 via Frontend Transport; Tue, 19 Jul 2022 06:16:43 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) by DEMCHDC9SJA.ad011.siemens.net (194.138.21.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.9; Tue, 19 Jul 2022 08:16:42 +0200 Received: from random.ppmd.siemens.net (139.25.68.25) by DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.9; Tue, 19 Jul 2022 08:16:42 +0200 From: Adriaan Schmidt To: CC: Adriaan Schmidt Subject: [PATCH 1/3] fix(isar-sstate): catch errors in signature comparison Date: Tue, 19 Jul 2022 08:16:26 +0200 Message-ID: <20220719061628.192078-2-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220719061628.192078-1-adriaan.schmidt@siemens.com> References: <20220719061628.192078-1-adriaan.schmidt@siemens.com> MIME-Version: 1.0 X-Originating-IP: [139.25.68.25] X-ClientProxiedBy: DEMCHDC89XA.ad011.siemens.net (139.25.226.103) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d9674c79-d2a6-4991-d4c8-08da694e4080 X-MS-TrafficTypeDiagnostic: VI1PR10MB3599:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /jxCq7EdMCfAdrRdvwEhnFTXIORFKeTYaS6D6KfZSWILhhYmG4tDvflaxdWtjyg1Pw/Se7QgpkDnSzsdOdeIT+jNG3LmNXWD0C4RlRY/sQu3sHZ+uLSmYr2yuOJLgHSxnin7Jc/XQHD9qVnnmxT30OyI6CQjvkcUp2pI/eyQULhLrtwu3uoLgWwdp8IceXP0enobUUAzDMApf7KJa2JrkKx7/accF8H1wJ1O31NmAvD/Gm+LreqVt5nasAMfL5s669qY1m8b985d5GBNbYoMN5vIz0Z0IAgJ27RGwGr8BV3upUkcN9c8fdYnaLUdbsjJsgMUFwNWTKizgNUw47UKFkuP8hTpmsVqgUQhPlirC+NauCe7XJ2QUF3N4hDQffb9MxKNDiQW62YY/Gm2am4nEFx8H0zCtL/FIie0IqamEvs2Gq/nyTwjni0s66p5rXfcWp/bWafSA/hXZOhaZjKSnqBTCyZehbFNU7oJgZYSE2gh+eH1q+xRjVaULps8GHgcySwS2/KgykniVPgiRFZKa1Ik1o2iil2Nov7xGsRDBz/7oocl9em3qrEWxKWpCQi+gyNkHHOTseDwt6RrMCk0kkFaRd0x6Dsabztc3XX4hNWWHNql4AnGHZE6oFIT/vht5+ROEETIlX5nYqs19eIUt1KQwwzpJ5Te0aUuuKM6aIv81jwp+EMN19382mzCo+eihQWiDVZ3SqvQlJKrdAkhSTHJZ+4uqs/FvbYm4mS379TzHEoIeQOL5HOsvVYrFd90eMcdG/WNewwI7CgzDwkZF0gVoVVopxdvJmWeFK1u75ukxEzFQWUU2RqqHE7P9Arb X-Forefront-Antispam-Report: CIP:194.138.21.70; CTRY:DE; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:hybrid.siemens.com; PTR:hybrid.siemens.com; CAT:NONE; SFS:(13230016)(4636009)(346002)(376002)(396003)(39860400002)(136003)(40470700004)(36840700001)(46966006)(6666004)(40480700001)(41300700001)(26005)(186003)(5660300002)(336012)(47076005)(107886003)(956004)(1076003)(83380400001)(4744005)(478600001)(16526019)(40460700003)(2616005)(44832011)(82310400005)(86362001)(6916009)(70206006)(8936002)(4326008)(8676002)(70586007)(316002)(2906002)(36756003)(7596003)(82960400001)(82740400003)(356005)(7636003)(36860700001); DIR:OUT; SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2022 06:16:43.6271 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d9674c79-d2a6-4991-d4c8-08da694e4080 X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a; Ip=[194.138.21.70]; Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR01FT065.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR10MB3599 X-Original-Sender: adriaan.schmidt@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=ARctPyxV; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 40.107.8.43 as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: INBOX Those errors happen when the sstate cache contains both pre and post bitbake-2.0 signatures, which have a different format (pickle vs. compressed json). Signed-off-by: Adriaan Schmidt --- scripts/isar-sstate | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/isar-sstate b/scripts/isar-sstate index 8ea85edc..9f5c17b0 100755 --- a/scripts/isar-sstate +++ b/scripts/isar-sstate @@ -781,7 +781,10 @@ def sstate_analyze(source, target, **kwargs): local_file = source.download(s.path) remote_file = target.download(t.path) - out = compare_sigfiles(remote_file, local_file, recursecb, color=True) + try: + out = compare_sigfiles(remote_file, local_file, recursecb, color=True) + except: + out = ["Failed to compare signatures."] source.release(local_file) target.release(remote_file) # shorten hashes from 64 to 8 characters for better readability