From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7031105237209317376 X-Received: by 2002:a2e:b0e4:: with SMTP id h4mr5837296ljl.117.1637056757444; Tue, 16 Nov 2021 01:59:17 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:a7c4:: with SMTP id x4ls2379741ljp.8.gmail; Tue, 16 Nov 2021 01:59:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJxNhxionQPqKa0Il7JXSzqhpQuPFRVNb71WSXE+Ju0dtz7o72y+mtpYOsp+eXdmfAzsGyTU X-Received: by 2002:a2e:a792:: with SMTP id c18mr5725848ljf.443.1637056756612; Tue, 16 Nov 2021 01:59:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637056756; cv=none; d=google.com; s=arc-20160816; b=kG2lvi8Q70jn1OjrLWgTM+nEdkjnPLxNcB+KzoArITpU0xBy0hf87eq6zdUADWdvtb xjKbt5dqIrr525yN8e8J2M0EJLjHW5iLNYbUaAhOXbFnLH7qH+Pz3rZXVlcgrNktRA4s N/mkpaz4n6iacka8ruCZJZEMqT+5AA+cfDjLUj2xW9UuT7GG/tqnKPTSVG7E3rHWyPF2 2+ncDqJgHxjzlHtjJlctAVj7LkHtumJQE0lJpHCpcxM7S5YN6ZSFMN+D9KTjRebnPpVK eMrb8XKLWkcPKRSGQj4ZHsPHTN+VgokUipkwroZ1SadcLwxoN9QpQRAiLjBXutSqRS8B SAWQ== ARC-Message-Signature: i=1; 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; bh=qwi/Lkgrad4ngNMCyO4bG1eu0VUoK6oT23523DpWgz8=; b=fVRVcOg3bVvLvVN/KEWkgUqq5DZLlWwrsncxw14EnW2G3w81DrGF4ML/Ldp9Iyxap/ pNNokiumIWuVR9Tak9wYqrdhZQLTMgKvatE35iZYXXpKhINShEqGz6aMSKC+jEV54Rnz it7u72JOj4cyln/nd2y8KkmJW/kIudvI0Wjs/gW0c/x6fJ9hVB5gPpu9YFhJXVz6cG4z uVtIBcFdWIlt/4A3bktRWE9aj6b5ck1vmb8XCYq8MggwnkQxAkPuaoe00WYP8DaEQXiD YWArrnqpib0PLhPSSTQoPmCToojP0TaQWtXXABsp6U2NhvmkhdcPUTgloo82QRB1BopU 1H0g== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id d8si1086162lfv.13.2021.11.16.01.59.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Nov 2021 01:59:16 -0800 (PST) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from localhost.localdomain (mm-96-28-214-37.mgts.dynamic.pppoe.byfly.by [37.214.28.96] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 1AG9xECM006212 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 16 Nov 2021 10:59:15 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH] isar-bootstrap: Fail on invalid apt source list Date: Tue, 16 Nov 2021 12:59:07 +0300 Message-Id: <20211116095907.198455-1-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED 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-TUID: VV1SfONL9PAc Returning empty list leads to ambiguous errors, so we should fail early if distro sources.list is empty or incorrect. Fix issue #72 Signed-off-by: Anton Mikanovich --- meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index e9f92916..20a9afaf 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -163,11 +163,10 @@ def generate_distro_sources(d): yield parsed def get_distro_primary_source_entry(d): - apt_sources_list = get_aptsources_list(d) for source in generate_distro_sources(d): if source[0] == "deb": return source[2:] - return ["", "", ""] + bb.fatal('Invalid apt sources list') def get_distro_have_https_source(d): return any(source[2].startswith("https://") for source in generate_distro_sources(d)) -- 2.20.1