From patchwork Wed Mar 19 06:49:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cedric Hombourger X-Patchwork-Id: 4115 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 19 Mar 2025 07:50:08 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f58.google.com (mail-lf1-f58.google.com [209.85.167.58]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 52J6o6Uq027764 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 19 Mar 2025 07:50:07 +0100 Received: by mail-lf1-f58.google.com with SMTP id 2adb3069b0e04-549b1b371fdsf3325343e87.0 for ; Tue, 18 Mar 2025 23:50:07 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1742367001; cv=pass; d=google.com; s=arc-20240605; b=hpvPh06q2kvc8KTRktZfLSn1EeT/Z53X8aYmjXO+XZ99hGj8KWMeD3uqBA+ih3SrxA UW0hWiMEk3TLRfc9QxqkZcqWJWtIZJHo4r5XxJ6A7dlNG6Bk9pcBdZzsOLd+FBsmwvDv jkjoUr4AGekkmDoHKR2ru1DTLY9PGRFuPkGiCeFZAbHOdEoxFvN+ZalGZ1RTPu4kOxNy H81AXlX6nZCA3pG5An8fN3iekfMcQjPHoDCuaX7seQICuIVDusyyTpM8zLt0q10PFRz6 tOuVZkVApFZpDW/AnQd2toxxnxaZGraAleULf5lDZTyVzX/vKNZZBabwtyaPHEEZJTP2 4yKg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=kn7z7JSczZS8cAU0KuU6rX4xiBk47Xc6bIqPMAs+BG0=; fh=9gLkAisleOtnVTu9eQjdEEHuKIJMfoQIH7WPFxBwlj8=; b=eHDqHaJ4BDqpzYR4buqYn9VVPeMh80qOGeYH5O/xaXjMluVCzoeChjfYmGtSdjpJv+ aJRN/IW9KlUfRhRpenaZdG6MMG6EFHeBE/CfMMd7/wblAKO6/kwq/YSC/wjAgh2RqgXw 6I8Wd3dgrjmMcjN29j/C1xpcHuUZUOySV5Pwnt8+q9yqm0xIGKpXzxBANpo2dos76Wqf qPQ6YC4K3cPP/AbmH+7sB3iTmzJ6uDMMvxVEeU83/qmqynUoaCptRzSCgwPHySmtbX6K 8rRgcye+tcN+X37MkA0CXy6kPRXefo/vZAdfg1RjQ10IfqF6tzTmeTMhtaAbhV4ID/V2 1HRQ==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=I07ygFS+; spf=pass (google.com: domain of fm-1212295-2025031906495694ce46377fbd5cebac-uoujd1@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-1212295-2025031906495694ce46377fbd5cebac-uOUJD1@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1742367001; x=1742971801; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=kn7z7JSczZS8cAU0KuU6rX4xiBk47Xc6bIqPMAs+BG0=; b=NE3cR7YTeGYlgSFNAhtCkizeE+bJBGtN2JqdqutgGB5dpv9zyn/D9ltKd5b1TKlak+ sPYolHdmDEx6ksMgI3FMu6PFxzx/wEEq9GYRqnGnQZW9q19lE86WyCODHWnPOP6rKSN+ dTSWucR3hVga8f6KpQsiS7pWQPum5BIzp9TW+IOQ58JiJ7UO5moYh8kqSEttU9B3zfMU 1KW3pPrBjwh1mYu+yh6hCQSIkIinEtjmzuS3DmxkkO9VLVAaOB4L8tybvl4if7bx43/B c3UlBYTWapPqZd2gxDO1ozlttNTlxyWmQHntAm3Dg9nO4bUCltIhKKdHvNme+9/JHfao dOiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742367001; x=1742971801; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:message-id:date:subject:cc:to:from:x-beenthere :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=kn7z7JSczZS8cAU0KuU6rX4xiBk47Xc6bIqPMAs+BG0=; b=Gh5wjVud6fzZBmpgirxQTB/JwJY3NsjL8lTqE5TvI9o3PYX2nOM8gsANz6Qxuk6lE+ a0eJ4iJFBVJb57lyXM5pZErF7PqED3C6y5+Zielc+Rkc8dufTEG7neK/5Yu5gAUExMfZ Ejox4gn1rqSHR700m05PlYNwrHB5wPmMh0tE/CChpa3QBCAKP5u45z5xPKC1zXR9h3gO bj57/TdIpJgKBjeCC3xMypf5r9uwm7VQrR++jxdcH4R1nx4SJZpWtEEhIkB40ov6OK00 CzNLbbc9OCmrwWNP73nWqNU1fMFyXlKhFDmJBVD3cCyIRRW/1HfhZkt2qSD60cRDvsV2 WX2g== X-Forwarded-Encrypted: i=2; AJvYcCUoYEJE7Bs4giJSs9PcvdTgWXzykham86gSCmmV6xjXgKemeC2LuTHzJFDIWt9PtCV0McaU02A=@isar-build.org X-Gm-Message-State: AOJu0Yxqq8ITkXC7xws+cviG1AIbBq4dsaJ4WmafYNsQwywVnTqdrZzP pylUHs0VUB/mBMvAYUqxkpksvwpCilWCS2oTtFkfeDE4qdLMrJnH X-Google-Smtp-Source: AGHT+IFHILF1eiaadC62n4s43frV38xTmyioFo1q6VJuD8ZxZzbCmxsEZCiBB+CfC2rtm1LRn4HAHQ== X-Received: by 2002:ac2:4f0c:0:b0:54a:c4af:29 with SMTP id 2adb3069b0e04-54acb21ed30mr606069e87.52.1742367000518; Tue, 18 Mar 2025 23:50:00 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h=ARLLPAIaegnEkxyvgbsCNq66QT4KiPEyCzjd1vnmeNEe8zFrcQ== Received: by 2002:a19:6451:0:b0:549:9b18:d550 with SMTP id 2adb3069b0e04-549b874d270ls155245e87.1.-pod-prod-08-eu; Tue, 18 Mar 2025 23:49:58 -0700 (PDT) X-Received: by 2002:a05:6512:3e07:b0:549:b0f3:439a with SMTP id 2adb3069b0e04-54acb1b8008mr424848e87.14.1742366997676; Tue, 18 Mar 2025 23:49:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742366997; cv=none; d=google.com; s=arc-20240605; b=VVyKDhsSY+TrVqVGXmeYMyNHl9KOB8x7ZdDYRqy6mrzDAb27oJ8mk1OrW4x2TENL1b DUjhs3iPrGaYwtCFXKxplGr8ZCM93HVajrdYilhbEj7g5POvCpdliUIKqtRMnbkMHN4s p6grZpLKhLOwwW9zLJ0K6VEg7PHMNDVTitM8yw1MJsrMr66Eh7lwTlNb9fJjkd+R+HPI exeiYumh/c43rQLziKXI5Hc1b8XjHvLCg7lD0ei9StniTUSMQoeLNVB3dx3mGNfduncC /xbk6pUUrOjEfsdiRAH44nQtjtz0O4efwQRUtCRJCskk8W4KgCeY+sQyAepET8diodo4 VVjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=feedback-id:content-transfer-encoding:mime-version:message-id:date :subject:cc:to:from:dkim-signature; bh=6Mq/YDmBibXjz3JnCQcAvs9rYU3W6oTUSSkj17cc734=; fh=1z37pEVhqwMLlkT4FDzOga7XBsM6Rzv6sXOq0pipxqo=; b=Y9JFHlRgVpqnfCbPR5pFzhhEgVpv74Askst3ne/CzlMfYC8vTdH1p/UwDAD95Q3NLn eGa4/pKWpZBqImMDQaOkSgvM3A/nkY8AI8G1nt/XaAm7+CbRz/jxFPSCDZGwwk5GuLZ/ ZllqxIDTeHvcR+IYjfl+/keWGDhThKHS08FsUYKUJ2L2P9INFxs4Ouyf1zT1W8/sA8G8 d7wDo5QFn/JxRC/tyejkgfuGTyjqJ1MxHht9AeKXPgNNzJz/TCOAWgmIVtBMCFoSHkJ9 sfDvZrGll0gEM93ujZzNfhllw4BSEM+4jTygiFv3MXpQoX7v1P0ElAFTPMBBtBF4TqtW 29oQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=I07ygFS+; spf=pass (google.com: domain of fm-1212295-2025031906495694ce46377fbd5cebac-uoujd1@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-1212295-2025031906495694ce46377fbd5cebac-uOUJD1@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net. [185.136.65.227]) by gmr-mx.google.com with ESMTPS id 38308e7fff4ca-30c3f182608si2990981fa.6.2025.03.18.23.49.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Mar 2025 23:49:57 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1212295-2025031906495694ce46377fbd5cebac-uoujd1@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) client-ip=185.136.65.227; Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 2025031906495694ce46377fbd5cebac for ; Wed, 19 Mar 2025 07:49:56 +0100 X-Patchwork-Original-From: "'Cedric Hombourger' via isar-users" From: Cedric Hombourger To: isar-users@googlegroups.com Cc: Cedric Hombourger Subject: [PATCH] bootstrap: use only valid pairs in get_apt_source_mirror() Date: Wed, 19 Mar 2025 07:49:37 +0100 Message-Id: <20250319064937.68881-1-cedric.hombourger@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1212295:519-21489:flowmailer X-Original-Sender: cedric.hombourger@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=I07ygFS+; spf=pass (google.com: domain of fm-1212295-2025031906495694ce46377fbd5cebac-uoujd1@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-1212295-2025031906495694ce46377fbd5cebac-uOUJD1@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Cedric Hombourger Reply-To: Cedric Hombourger 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=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,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: =?utf-8?q?INBOX?= The following construct may generate [] entries: mirror_list = [entry.split() for entry in premirrors.split('\\n') if any(entry)] A valid pre-mirror entry is a regex and replacement URL tupple. This causes an unpack error when evaluating: for regex, replace in mirror_list if the entry is e.g. " ". For instance " re1 u1 \n re2 u2\n " would be translated to mirorr_list = [['re1','u1'],['re2','u2'],[]]: only the first two entries have two values, the latter has none. It should be noted that split() will do just fine when multiple spaces are found between components of a valid entry (leading and trailing spaces within an entry will not cause issues). After checking if entry is iterable ("if any(entry)"), only process entries with exactly two components (silently ignore others) so we do not die with an uggly unpack error exception. Signed-off-by: Cedric Hombourger --- meta/classes/bootstrap.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/bootstrap.bbclass b/meta/classes/bootstrap.bbclass index c0644acb..64702d5d 100644 --- a/meta/classes/bootstrap.bbclass +++ b/meta/classes/bootstrap.bbclass @@ -123,7 +123,7 @@ def get_apt_source_mirror(d, aptsources_entry_list): premirrors = d.getVar('DISTRO_APT_PREMIRRORS') or "" mirror_list = [entry.split() for entry in premirrors.split('\\n') - if any(entry)] + if any(entry) and len(entry.split()) == 2] for regex, replace in mirror_list: match = re.search(regex, aptsources_entry_list[2])