From patchwork Wed Apr 20 03:52:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 1698 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Wed, 20 Apr 2022 13:52:45 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f60.google.com (mail-lf1-f60.google.com [209.85.167.60]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 23KBqi7N001833 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 20 Apr 2022 13:52:44 +0200 Received: by mail-lf1-f60.google.com with SMTP id x29-20020a0565123f9d00b00471c2bbf57csf29490lfa.12 for ; Wed, 20 Apr 2022 04:52:44 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1650455559; cv=pass; d=google.com; s=arc-20160816; b=kNPyGizFV4s+3rQCli1Vq90LOeX1jOVVGigMeK2WHmPz5hQRWkDhMdACtINn5tu0d0 eRU/pOqBw/gkjkMfBZtfp46eFPHajT13ECGK9oc6hNaZAiXnlDR/8wLJMS7GJjw87UFF xpYwdQXxvHUS4a7PY4SOJg2CPrMMBF3sKoqBF+4D6yGOrIRAHjF29Yq60p1uroDO5JfV m2PUNJLNQ/9FLt/JlRMeXQqciU67mlaxPmJEJPy8eYdw7kZhh9nWYOvi6Fw3Byd/q66R a6/4d1bMLlxvZF81RnQzAxubBM4mag0Tze4Xjs38wVR83LA+lg0SZoN0uEAK/Cnhkcc5 GJRw== 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:message-id:date :subject:cc:to:from:sender:dkim-signature; bh=UYm+UScGhxliX5TcF0ULgudRwEC/fV2KnafLYt+/3Kk=; b=ZY85L12cJ3RPa1x9wakE2oQkv4+XlZR9iEUrzyyVqUBXEYplK4rz7EicrYcD1xhAKx 6JtlFbjg23Kdqe3YHsXceOsIvIAGkYrQr72iY9jxUD/K5xU/LB/U9oQ1N9zGgG4uNtIE OzB5zXeTsymZ1CvoSXSDsmxFZw6JStND/p4A6yiUq60GB6wr1D0+/3IPFpVCq9VkZW3w vDA/W4hl6fRTGIs6H006msBzXM9sMgEU+rtN5Y16bZiPLprc6TnOoY9PL75rbObifmlj udLeb1hQPbGUL2Az+tn4ziNDHLOkFlngw4aJu6TwK01XR4UARmq6hWNyLRysd0FkA4Xt 2wkw== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="R2/OBfQf"; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe0d::615 as permitted sender) smtp.mailfrom=henning.schild@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: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=UYm+UScGhxliX5TcF0ULgudRwEC/fV2KnafLYt+/3Kk=; b=rsCy+MihGGWUaV+dvt45Y0NZ0SkivTxMycAAl5jUZyhpF8dYgm/D5eS5hEI7lwMkEG scTXBsPdhU/ZbJ5zG63zdSEdYnUreA/GU2+OG2NTBN2GjJDv9+7KJPCqCqNuphB1KXxK fLzAAA9YUJcqmIb2G5ytTt+Nk+QMpyRtyLmSICW9hGk6ZicMdJ6JPuxfDKY308jlBzr6 v//cuw1V+TUTp54ukcr9HZVfkapdhZE4D727PJCzcbK2GHfrbBBNSPYKiZMB0CyBtoPf SqUe6qPKqyOD1CbIpP2Nyl3y9i3RV2Z5w4YHqh+DEDNObQDb+ELVAdq9Q6KODoN2vRfa bxyw== 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 :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=UYm+UScGhxliX5TcF0ULgudRwEC/fV2KnafLYt+/3Kk=; b=IpBkeM49CJLTiSr3JGLTBKOx5novWklOLt1Ktre0We6HV4iRGPpKcUUTf+tbqLkVej 49oF5lkrz6BTuX/ofuU9qM3EdF2Vneu11UDEGQ0utNf6M4xOHnt98D3jSH0AB+2uW4nC vHEx1yinIZv8QVUrliKRC9pVSh/ZWSbRytRoQcd9RAYGTJ5IcPXN5K7263iJIoROviTE QXMawJqivtJfCLaLxdHFfrTcj5wqHnx41odg+23z9G0bDad3x4uBjjbNMKXchTd3a7qJ 1mQgCCgxaYYjKvJ8HJORrje6Dd7BgaSDbNGzvejhRPKE3flBWfCsViEl1jW6EUQUrMqN ku3A== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532b7IeoE50lcx0pNOw11zD3XB6nzXFVr3fcF8lNYdLSY9T4W5w5 p1mwwOr0f/PBJ6vyHow5nQM= X-Google-Smtp-Source: ABdhPJwstjb/xTjgRli6oPNUrkyqB3ICK3iPMR1vIs4Fz2gwoE5eltpnB1iC9prOV1tHnMJM0takgg== X-Received: by 2002:a05:6512:ad2:b0:471:8b10:860c with SMTP id n18-20020a0565120ad200b004718b10860cmr11293252lfu.610.1650455558777; Wed, 20 Apr 2022 04:52:38 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:1693:b0:448:3742:2320 with SMTP id bu19-20020a056512169300b0044837422320ls1678723lfb.1.gmail; Wed, 20 Apr 2022 04:52:37 -0700 (PDT) X-Received: by 2002:ac2:5630:0:b0:46d:178e:983c with SMTP id b16-20020ac25630000000b0046d178e983cmr14162184lff.46.1650455557714; Wed, 20 Apr 2022 04:52:37 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1650455557; cv=pass; d=google.com; s=arc-20160816; b=odDYlmTTy1+N/PM2wqje9j+UD+don4I3mt/yFKQsTh4RqR9wRZy2zrB3g5xEvHm3IJ ufSKH40bIr22OpLerTQ0H9aGJHc6vdEe5TOpPSEvg4x+W/O8CGx3vccSa7PKcwfYAgFs sOVP+S7p9OgRLFB6qZ06cnZku1A83Y38zQREzndJVIw86Fgke0LnRYhlFppjg6Q7WnFi x9ZRmYm8s11jCtDSDRluGctd/B4XC91ie1+lIvdWbyPDvpbKmnQntw0yfaxOm+20srAX ctzji1lMYyEuDoUtlKnvAv3me4EzmTbHkvJFbnhbddgxef6ng9Kz5wfnPT5FPg6xfz4D muIA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=+kqvgQ3w3ylF5b/DE2FjCcjn2wzDx0NLTnS0bCTWk+k=; b=o4mGFZwjOdznbOIm9A9Z3FUAjLakHxjo4zAQ7LGDtwYDrx3gvuM8dLX+IHqGE69EOv vdNASgR8/hGCevHF9lRWHqxjnHipBwii47NzvbTp/M/Ih/cJhPZoR4eBTjiDEVibPKdV w+IA0MDBk48D35RY4+hOu8pc7rt75bb9IGdDyyR74trtzVOtOFc5Nh1H1FGB0rrMUkYi BWshMlvle5QS/0HlSrjurvPz1xmHOC67CL9l8R+VJI5cWjamipcUuRqJ50ydmgrdQbmd qWI9yrESawZWmf2kfcOUitNYf4w3ubi9gxs+8tloLtc6RiJNqqMFWKgxurCSy7XF14sA hWew== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="R2/OBfQf"; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe0d::615 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0615.outbound.protection.outlook.com. [2a01:111:f400:fe0d::615]) by gmr-mx.google.com with ESMTPS id u14-20020a056512128e00b0047196449b6bsi87706lfs.0.2022.04.20.04.52.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Apr 2022 04:52:37 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe0d::615 as permitted sender) client-ip=2a01:111:f400:fe0d::615; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZjoL7D0YktCB4jqd9P9zks7lNO/XAsrMebmtg1dakTc0XIheH4Ro5QqkNNfmwYy7RQKiQ3hnYG7XiRiH4qn78w+GMJ2J0Cj5tXT8yqyRFlrq2G+uPkJlM7tSlclU2yVyVnQgArvNx/bD2rDZq95rVdAtsF/rkneptAMDFXqsfJge/CDYnaHWwVbcoevpV8ZEf9I35CdFcA92M8M0fy5z7WIGzTrLii48L2/BzIxSQcZxQdpth5T+w7SqWmPvckQYqI4xSOabX/1VyszuU3TasyeywmZvm2s8MIEiGnDhE+xIpDnl6BWMocwWDdedNfOccPQagvxBadcM8Ss/LDIAuQ== 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=+kqvgQ3w3ylF5b/DE2FjCcjn2wzDx0NLTnS0bCTWk+k=; b=ZMemP3n3+00IeQBplQErZXRo0DaR49kTHvlqLySgzA4+jMAxRIzhefdq2NcNICAlso64uag/Zc75VYDX+CaLEJ2cy9tqMP43y4daRjisjXHQGJHk74hupPONGtHVgBJ2JbCgapMqs8acrNSkqzMgoOs7kd/t4NThCLs0Wb1CXYWxRuQ8eHX4gcqoW9ofq2eTsrnncvGg1C0yo99H52eni8JrVriBFREaANGT5BtXnoZpfjjY8sE5OC9jklmLfpCWsLVMfGS0P2UqS9mOGfS2n5ony4w81pmb9LvizLmfA2snNZ464TgNn8M7cqlR6XTxXsjErHfvPm9xdgNaaG/vsA== 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 OL1P279CA0010.NORP279.PROD.OUTLOOK.COM (2603:10a6:e10:12::15) by AS1PR10MB5603.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:47a::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5164.25; Wed, 20 Apr 2022 11:52:36 +0000 Received: from HE1EUR01FT050.eop-EUR01.prod.protection.outlook.com (2603:10a6:e10:12:cafe::86) by OL1P279CA0010.outlook.office365.com (2603:10a6:e10:12::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.13 via Frontend Transport; Wed, 20 Apr 2022 11:52:36 +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; Received: from hybrid.siemens.com (194.138.21.70) by HE1EUR01FT050.mail.protection.outlook.com (10.152.1.29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5186.14 via Frontend Transport; Wed, 20 Apr 2022 11:52:35 +0000 Received: from DEMCHDC89XA.ad011.siemens.net (139.25.226.103) by DEMCHDC9SJA.ad011.siemens.net (194.138.21.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 20 Apr 2022 13:52:35 +0200 Received: from md1za8fc.ad001.siemens.net (139.25.69.161) by DEMCHDC89XA.ad011.siemens.net (139.25.226.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 20 Apr 2022 13:52:34 +0200 From: Henning Schild To: isar-users CC: Henning Schild , Florian Bezdeka Subject: [PATCH] bootstrap: handle python exception for missing sources files more readable Date: Wed, 20 Apr 2022 13:52:24 +0200 Message-ID: <20220420115224.27674-1-henning.schild@siemens.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Originating-IP: [139.25.69.161] X-ClientProxiedBy: DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) To DEMCHDC89XA.ad011.siemens.net (139.25.226.103) X-TM-AS-Product-Ver: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-AS-Result: No-10--7.544900-8.000000 X-TMASE-MatchedRID: WeFhSxvsApM7RZ9SX+rqZWzfErPhr3FAl/8G0CDigbo7D10axdYTQyXZ p8eIhCoj31GU/N5W5BANd27/2GP2zsSfmHQtJMBvOSUy4Qb/L1o72d2F4DOSZLrbxxduc6FP64s VlliWKx8fE8yM4pjsDwtuKBGekqUpOlxBO2IcOBb6VR0JgLvG9S0V/rhY6WIpyWV4t1T5S56LM6 qkSaghj0wbHjAAh5QUQwymtxuJ6y0= X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--7.544900-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: A9BD1D842F7F9CF2954033018EFB582438927CF91078EE48D9EB4FBBBE6D10762000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 519c08f9-b2b5-4db7-c979-08da22c442ef X-MS-TrafficTypeDiagnostic: AS1PR10MB5603:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: h3o806C0pOg4jH0FaxNN9ph5rLi6DI2BpSpDAT6QuFAYt0awQNixUValYbgdo4m8x7VGUjz0cElbvw6yamYr/AKPrzDlT0+SZpvlfbp4LQUqdv7RQzkjSatqEVyq3Impqb89ThTXVjze93tBkETQ3Rkx1dL6kb3Y524STxlKOGLtm4iNUE8kBn1oitYvKan3NFlHewZvs6Vzk8+lyLWPCa/jbUUgeCGz8GaaMnjCVXYdLfywDfqE+oKt6BG1ZJy1MjdqeJD9XtnVP47SOC2Y3SGWi1+xzTKYFLDPhkzAR363DKqmXmSj+Qxs+IldlAGo2E1OF0jJIXzrnoDSIpHo0+/JPHOQ7g4KTdmqdhAykUrylkXxcaFSOEY7H/a2+2hL2uINtDHic+w8rhyhlwsnPGYhjNQl3/O8tZJ4NLS2WD1lYnbZiAa8x2bUut99QZHl2KKe9AcygjYGqWCu7pDAGnklna35nVUlhCZI4uqyjxM2dWcvjkiBfnVhmdVW9a7GU9estR2S2C0qwMZiRHZYOyLp6wH6Ch4MWsKTqa17ZHtCR1EAVChVDvb5Rki0uWu5+IqND0kLDH4TCrDmTvUNBmAOjmX7O8GLFDpiN11DTEOyYVXvH0ft7jzOSF8AetJCK/YNpXoSDZSyNTGKoiFcLl2qjpjjDm6vBNo0+/Bp9FX4gp8WINhcgl2JEGyeOitE 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:(13230001)(4636009)(36840700001)(40470700004)(46966006)(8936002)(70586007)(2906002)(40460700003)(336012)(186003)(16526019)(508600001)(36860700001)(2616005)(36756003)(26005)(1076003)(956004)(107886003)(44832011)(6666004)(83380400001)(47076005)(82310400005)(316002)(82960400001)(356005)(86362001)(5660300002)(4326008)(54906003)(6916009)(7636003)(8676002)(7596003)(70206006); DIR:OUT; SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2022 11:52:35.7510 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 519c08f9-b2b5-4db7-c979-08da22c442ef 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: HE1EUR01FT050.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS1PR10MB5603 X-Original-Sender: henning.schild@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="R2/OBfQf"; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe0d::615 as permitted sender) smtp.mailfrom=henning.schild@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,RCVD_IN_MSPIKE_H2,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 When a file for DISTRO_APT_SOURCES can not be found in any layer, catch the exception and turn it into a bb.fatal. Which will be much more readable to users. Reported-by: Florian Bezdeka Signed-off-by: Henning Schild --- .../recipes-core/isar-bootstrap/isar-bootstrap.inc | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index a6e370e3b7db..b4bd2dad87f7 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -147,14 +147,22 @@ def aggregate_aptsources_list(d, file_list, file_out): out_fd.write("\n".encode()) def get_aptsources_list(d): + import errno apt_sources_var = d.getVar("DISTRO_VARS_PREFIX") + "DISTRO_APT_SOURCES" - return (d.getVar(apt_sources_var, True) or "").split() + list = (d.getVar(apt_sources_var, True) or "").split() + ret = [] + for p in list: + try: + f = bb.parse.resolve_file(p, d) + ret.append(f) + except FileNotFoundError as e: + bb.fatal(os.strerror(errno.ENOENT) + ' "' + p + '"') + return ret def generate_distro_sources(d): apt_sources_list = get_aptsources_list(d) for entry in apt_sources_list: - entry_real = bb.parse.resolve_file(entry, d) - with open(entry_real, "r") as in_fd: + with open(entry, "r") as in_fd: for line in in_fd: parsed = parse_aptsources_list_line(line) if parsed: