From patchwork Thu Jun 17 15:43:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Haemmerle X-Patchwork-Id: 1493626 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::23c; helo=mail-lj1-x23c.google.com; envelope-from=swupdate+bncbaabbrg3vwdamgqeu6qurjq@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20161025 header.b=OG/d7xl5; dkim-atps=neutral Received: from mail-lj1-x23c.google.com (mail-lj1-x23c.google.com [IPv6:2a00:1450:4864:20::23c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4G5RDp3rq8z9sSn for ; Fri, 18 Jun 2021 01:44:08 +1000 (AEST) Received: by mail-lj1-x23c.google.com with SMTP id j10-20020a2e800a0000b029015f88d3e725sf3245745ljg.6 for ; Thu, 17 Jun 2021 08:44:08 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1623944644; cv=pass; d=google.com; s=arc-20160816; b=DqX8njo37QLRgu+W+bHRjn6E4/dL1iQPdNt528+V7whloBd3bAg+/BJbMtFWC1bryC j60JiUmxE4fXgNofTlZtX5jA9NQaLm4zSrnvskF6/3cq23pFgIPL2BjLKE/cfpxMiHOW CeyiUKOmK17UGu2rkZHMIAVBYFQG8EizhNj2n9Q3OJgMm+4IuLx6Jz5iGZlNpq1+gaXY hesRwPiNa8+Ul8r7acfeWPv5Oj4G8cw4+0XiHqZ0Zr4pwgmB2yLyaVJ09Mzce6KsY/aB 0f+VLq7KiEuwaFYDh9rV4J7qC637YZremwVKYMGboiTeqHfTEAgGyRUv/gM6t+fnUYaX 15ow== 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:reply-to:mime-version:message-id :date:subject:cc:to:from:dkim-signature; bh=AlJSDvOEYRmotCeS+XnXPrUMjWJGgLxqUhee9gVRSrk=; b=JzqYnctlGMgmHv02vcVPUI99R2Jjzs3Ijd3Y/iVsHBYYsgYBqWDNlNshWKnRCwgffQ MTFM7ozUjwolN+8FfLa4ws5Hc9Zz7JbikRZG9zRDGJ8lzBX1fjyZXMyTrV86zf7ilefX qaWL2FmwQe/oO3QwvdvubzLVjYwTvtESr5OZkcDnggyCBGdU5OuO+FtPnsGXoGBJCit5 R6UIU+ZPdtKiNpqsEYLsZyID+21zi6urtD9ZvqHtCl89fR57B77x7f2uGSKQ9QB0A1eN fCLa8/0LzSfvENHml64VnfpTA2TDHPpcHe3UuUikpQ6DhBxIpSNOWbXHcfTx0yiJlkv8 0Trg== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@leica-geosystems.com header.s=selector1 header.b=Xj1jyrqD; arc=pass (i=1 spf=pass spfdomain=leica-geosystems.com dmarc=pass fromdomain=leica-geosystems.com); spf=pass (google.com: domain of thomas.haemmerle@leica-geosystems.com designates 40.107.14.129 as permitted sender) smtp.mailfrom=thomas.haemmerle@leica-geosystems.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=leica-geosystems.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version:x-original-sender :x-original-authentication-results:reply-to:precedence:mailing-list :list-id:list-post:list-help:list-archive:list-subscribe :list-unsubscribe; bh=AlJSDvOEYRmotCeS+XnXPrUMjWJGgLxqUhee9gVRSrk=; b=OG/d7xl5q1ODTylvOfUhi2Ncp5Gy+OySFo3hLV+xs+ELZlkwdKdkmiYe3CQEGufiyd 9GvwvqJmn40U6tP5E1MBpc8JtCLtNe6dN0iISOK9eTelDY7lxa88nKMk9/a9OgIL62ns aW0zmzARmYgm0cPNyWsH9q7bdTagpQLc2j+ARQnMOEqnSRloz5UYNKa1kSCWd8LK/fdu aorjWxk9eyKhKm2FrtMIuT5QuaiA2uA+hoiDmUrtz8ve7oE7UjUqUZFYxjFARjKMaBn3 nrC13cBXoqmugJrvq7Ibl1LCMGYdkLXh8KG9YZcXsz2xvFvfYJaldXwpZRqYwxgVfDAD K1Sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :x-original-sender:x-original-authentication-results:reply-to :precedence:mailing-list:list-id:x-spam-checked-in-group:list-post :list-help:list-archive:list-subscribe:list-unsubscribe; bh=AlJSDvOEYRmotCeS+XnXPrUMjWJGgLxqUhee9gVRSrk=; b=IY6/ELOmHhRg/mwsGwbw7hXoo0b21RCFPrNWPt5UpKY2WFkZOpFPg0j6hLuWwsFFCw XFnsxcDZ5YdhmaFq1hRUYSPIJMSoZlKSBrU8y4mJ19QP1mi2CKo9bEnEKuvrkT8JowUP TAAva3c1sORENCyNgUjxGnGLaXYl/BYghTGmSwPITGFGbAXb1kfJU4N09KJccU25KQDG DFJl9RFctbagQLZwy2Cqpf7JM7sz5CMECEROo99yMBMRi7IOFqiRugsbjzca/4rw44u5 mA6TzIz365KMYRKpPipmToJJM7vSSYQbO4tUPAzVflicjxkgMTIljdwfrJRbNb3/gE0x +lsg== X-Gm-Message-State: AOAM5310E5cxbrJ+OLF/blJXDbTP2Nh+NhinM7oBDxGajTjIV7GBX0ID VLfnPsrH7lNLWtEVZ0xhafQ= X-Google-Smtp-Source: ABdhPJw2Kjo/WM+Aw/Z+6YAzqh6r/HMfOPDHUlYKjpjr3EW5sIlsWKToKepWULo+D2a9Nlw1BVIfPw== X-Received: by 2002:ac2:509a:: with SMTP id f26mr4622621lfm.505.1623944644312; Thu, 17 Jun 2021 08:44:04 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:6512:3f94:: with SMTP id x20ls1071620lfa.0.gmail; Thu, 17 Jun 2021 08:44:03 -0700 (PDT) X-Received: by 2002:a05:6512:e8f:: with SMTP id bi15mr4175375lfb.296.1623944643504; Thu, 17 Jun 2021 08:44:03 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1623944643; cv=pass; d=google.com; s=arc-20160816; b=g2yPd4ARJwCtXJdqHMNqELkNcVmjkl+0O4ILLfhIhRZW9xyxFofnPpD7iooZkF1Bh1 GHLJz0BpyCKlq3fQmKvzi8m6M9sDo38VtubOTOgc8TYwMavrNDmfiPE91AfYfMgK6FXC cN13b/Fcii/GUE3cidb4zhKz7uvELbwOD2OYWaweDqNtbufaU2Ef6y5MLvakOvbzfLW4 /mJiPEOUJR+UpOt8VGxQrj28WNV7b4KZ2nljeZoNSgaxNOlkcGkNvssvrCcHPGzm9Foz hDSBx+mno3GvnHeA6k1Dknc3KKxXPI3Rv7jhBQT3SEY6QYSCwixlr1+wVBN6glaO7uW3 VqtA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:message-id:date:subject:cc:to:from:dkim-signature; bh=aBaR6Zk2k2ccpCYLZt91A342Sqv8/NEiLMiA87cLa58=; b=MaLX2JDeOqP1Kb/XjoLlj9Yi8j9uQzMevVOS/NIeXp3gIOYpqscvWg1spBT4g8me54 zLDeBCziG+MredHeZLaw25026ETEJJt5gN37zQQX0vQTDQTpzrLg4eY93d89hYCSXlQ5 gi/5lgsb9MoAtwC5PYta0NlTU8r8ndNn/WeHB+4C5/M2Bb0Il2pCcD7VuZjBEdm7sPsE Pl3xIweDopy8FrF4iNDgphdcOuFIOZ6OMbDCBKtXxtA074ElsYaEwhsHoje8QctsQi3S tJMJloz0OOl80CqwZkjBioNyBtzaN5d9Rtz3RjfFz/HoHyDTsb/FSkwzKIKf5zdJGdYC L2Vw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@leica-geosystems.com header.s=selector1 header.b=Xj1jyrqD; arc=pass (i=1 spf=pass spfdomain=leica-geosystems.com dmarc=pass fromdomain=leica-geosystems.com); spf=pass (google.com: domain of thomas.haemmerle@leica-geosystems.com designates 40.107.14.129 as permitted sender) smtp.mailfrom=thomas.haemmerle@leica-geosystems.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=leica-geosystems.com Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-eopbgr140129.outbound.protection.outlook.com. [40.107.14.129]) by gmr-mx.google.com with ESMTPS id h22si269818lja.5.2021.06.17.08.44.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Jun 2021 08:44:03 -0700 (PDT) Received-SPF: pass (google.com: domain of thomas.haemmerle@leica-geosystems.com designates 40.107.14.129 as permitted sender) client-ip=40.107.14.129; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N8Vrx3a2AJTXjrQjC02m7lbbD4iou437SKjp6JFOMJmWrI85sn0CO3eWNYzuFCu3aYZ5fTflH0OfSmvIdI3KpJaB784iRrmq/Ml7uv9sSJTljkLJ0HYKg4gmhbpLtC2cx4/T6Q/w+O8G/Br2yx127zhXl3cMedCbiFjB9o1S9XYNZNqqs5HKe8J8swYUEOwtRZGdDfeeDV7QeqJH77v/D9tnrCSQtKk64hLI0eCNLBFuNP6btXpMOX/xrkdXBcHFP1Yr4QRB4MDYwhEd9zcjuBwc1eeaB+c9AKvzKandYo/kUIsSlgqOGIC9ZmkKLI/tpuoRdkYaj+WVA3unNQ5HCw== 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-SenderADCheck; bh=aBaR6Zk2k2ccpCYLZt91A342Sqv8/NEiLMiA87cLa58=; b=ChFFd/Gc4qmow6SSd4d6vWwzrc++iM4+H0lcch6fFTrAAxlU8nmwzYdqF9qqOnqB54hTDZbzK7q/drg2au/uKo4zLiXkgwKzsgLiLOYsVg4EoMBKlGbTutVuqpgkz/J33h1fJu9kerDQ1PdEkoA2+P1j7bslVF4Hx2YJzXLzzdJ4nRW6pIAmdgwuKwhaqjNYrowGpPyQmLdsdizDW1PvdkyCXeV+18kcaObWg6Jxn9Yz0DY6Xm/L8cwQC2Jl+iIgPaXm7AiOunmj4c7Tq4eoRkVSyvg2UDPCxIpor9jpFj3wBxLw2QuXI0VP+fokFkSaqYeWO+lzVVPC8O6rwTLGgQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 193.8.40.94) smtp.rcpttodomain=googlegroups.com smtp.mailfrom=leica-geosystems.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=leica-geosystems.com; dkim=none (message not signed); arc=none Received: from AM6P191CA0001.EURP191.PROD.OUTLOOK.COM (2603:10a6:209:8b::14) by AM0PR06MB6195.eurprd06.prod.outlook.com (2603:10a6:208:169::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.22; Thu, 17 Jun 2021 15:44:01 +0000 Received: from AM5EUR02FT017.eop-EUR02.prod.protection.outlook.com (2603:10a6:209:8b:cafe::5e) by AM6P191CA0001.outlook.office365.com (2603:10a6:209:8b::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.15 via Frontend Transport; Thu, 17 Jun 2021 15:44:01 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 193.8.40.94) smtp.mailfrom=leica-geosystems.com; googlegroups.com; dkim=none (message not signed) header.d=none;googlegroups.com; dmarc=pass action=none header.from=leica-geosystems.com; Received-SPF: Pass (protection.outlook.com: domain of leica-geosystems.com designates 193.8.40.94 as permitted sender) receiver=protection.outlook.com; client-ip=193.8.40.94; helo=hexagon.com; Received: from hexagon.com (193.8.40.94) by AM5EUR02FT017.mail.protection.outlook.com (10.152.8.111) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Thu, 17 Jun 2021 15:44:01 +0000 Received: from aherlnxbspsrv01.lgs-net.com ([10.60.34.56]) by hexagon.com with Microsoft SMTPSVC(10.0.17763.1697); Thu, 17 Jun 2021 17:44:00 +0200 X-Patchwork-Original-From: "'Thomas Haemmerle' via swupdate" From: Thomas Haemmerle To: swupdate@googlegroups.com Cc: andrey.zhizhikin@leica-geosystems.com, Thomas Haemmerle Subject: [swupdate] [meta-swupdate][PATCH 1/2] Fix error message in automatic versions Date: Thu, 17 Jun 2021 15:43:45 +0000 Message-Id: <20210617154346.23097-1-thomas.haemmerle@leica-geosystems.com> X-Mailer: git-send-email 2.17.1 X-OriginalArrivalTime: 17 Jun 2021 15:44:00.0528 (UTC) FILETIME=[97947100:01D7638F] X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 190cc41b-07e2-4165-aca8-08d931a6ba5d X-MS-TrafficTypeDiagnostic: AM0PR06MB6195: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:883; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jNArTVAa8Msy+4Xnyy1NhVAbMuReQ7EfBMBFP6qSAriSHbilbBRBr5v4+SU7XZ6iF6iPc9CpereCfFVnUoxbI/wy3tXnGkCWndIkMiyqTvGI6TO9kcVatZ+OP+FMC4e5ZcAosbc9Z54+XjWiQWC+EzOmWSHBDtCdmlI+pTuHQJKkcJmbP+29oKxWrETomLeV3bDPb+9x3cZc8ZuTMyNxm8ov99u4uDy9yOJ+OMjRTD6GvIwTVh6ZLWLIBWMKTP8rEyN9JxZjyCFVL6B7MAtUN9fcaIbabmSZ0fX7o2WXAzFsZOxTMfi9bCOBLgQcNt0/L+AV1X3OsmV5EhbjqgCcWSqB8y9EK+B0huH1Aj9jfdHEPfj33kUGCxYm5cW9UCZeRDEDkY9cYfO9hfjrwEe2PzjQIEzsizQPMHcYa1PQQAkwmYTJoxBEB+Po+5LgXTJMZGDSQ1tMW7dDVG6mWHVTWpYYCu4CkZfTreFc8890iTgCcYmhdearfcPlYDuy8pgGX08iaA5Nd5+GS57EKCVomLm/gg1AGETwf7qVgg2h34XQS5lUYAk2wtU+uuy6v6u9Lu2PUDY/V/8kJFWmZWgxteyWtJ0uvcYm+x0/++ocb6USV/Q1749D+HpE3igpb5PViL7sV8Nd/nQtfgM3HWPMxdDvxcppD4WdVjTk+ULEou0i/CS5m4FoC2T8JW5vVWY4 X-Forefront-Antispam-Report: CIP:193.8.40.94;CTRY:CH;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:hexagon.com;PTR:ahersrvdom50.leica-geosystems.com;CAT:NONE;SFS:(4636009)(36840700001)(46966006)(83380400001)(82310400003)(356005)(44832011)(36756003)(107886003)(34020700004)(70586007)(47076005)(26005)(5660300002)(4326008)(36860700001)(6916009)(6666004)(2616005)(8676002)(8936002)(81166007)(2906002)(70206006)(186003)(336012)(86362001)(498600001)(15650500001)(1076003);DIR:OUT;SFP:1102; X-OriginatorOrg: leica-geosystems.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jun 2021 15:44:01.0329 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 190cc41b-07e2-4165-aca8-08d931a6ba5d X-MS-Exchange-CrossTenant-Id: 1b16ab3e-b8f6-4fe3-9f3e-2db7fe549f6a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=1b16ab3e-b8f6-4fe3-9f3e-2db7fe549f6a;Ip=[193.8.40.94];Helo=[hexagon.com] X-MS-Exchange-CrossTenant-AuthSource: AM5EUR02FT017.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR06MB6195 X-Original-Sender: thomas.haemmerle@leica-geosystems.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@leica-geosystems.com header.s=selector1 header.b=Xj1jyrqD; arc=pass (i=1 spf=pass spfdomain=leica-geosystems.com dmarc=pass fromdomain=leica-geosystems.com); spf=pass (google.com: domain of thomas.haemmerle@leica-geosystems.com designates 40.107.14.129 as permitted sender) smtp.mailfrom=thomas.haemmerle@leica-geosystems.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=leica-geosystems.com X-Original-From: Thomas Haemmerle Reply-To: Thomas Haemmerle Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , Assign variable before checking and print a more useful error message if none of the files in `list_for_cpio` can be found in group. Signed-off-by: Thomas Haemmerle --- classes/swupdate-common.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/classes/swupdate-common.bbclass b/classes/swupdate-common.bbclass index f41abb7..eb3ebd6 100644 --- a/classes/swupdate-common.bbclass +++ b/classes/swupdate-common.bbclass @@ -98,6 +98,8 @@ def swupdate_expand_auto_versions(d, s, list_for_cpio): data = f.read() def get_package_name(group, file_list): + package = None + m = re.search(r"%s:(?P.+?(?=\"))" % (AUTOVERSION_REGEXP), group) if m: package = m.group('package') @@ -108,7 +110,7 @@ def swupdate_expand_auto_versions(d, s, list_for_cpio): package = filename if not package: - bb.fatal("Failed to find %s in group with \"%s\"" % (filename, AUTO_VERSION_TAG)) + bb.fatal("Failed to find file in group %s" % (group)) return (package, False)