From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7031105237209317376 X-Received: by 2002:ac8:5fc2:: with SMTP id k2mr18760747qta.310.1637169151947; Wed, 17 Nov 2021 09:12:31 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac8:5c05:: with SMTP id i5ls294646qti.4.gmail; Wed, 17 Nov 2021 09:12:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJxejWMfelkkMHSbWofVrzVWMYqGko6G9TjwXw9/eaUfi+/K5Si2d6Pl4vuREMyAHCGj4e73 X-Received: by 2002:a05:622a:d3:: with SMTP id p19mr18485813qtw.37.1637169151403; Wed, 17 Nov 2021 09:12:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637169151; cv=none; d=google.com; s=arc-20160816; b=a6Dc37cc5i6KXJudsGOfnbCP80l8HD7GyaFvnbdxW001LFrZigWqXDZpTRkmI8kzQx NoTTW3tSB9c2B6k37ZLDCV4YS6e5MxwHpsd3ddMkw+qweQx2oduksNKWi2bnKU8e76dN P8WuoHUwfcIfEW/e2BgDAR81dX6DkPGinhtteLtaSHEqZTm669GdFSqzR+bemVEp4N8L ysWjX/I4k9fWjTS3EPsPtBXD6Hwh1f2GNHy1iuRFuxlsJKkGPkK7PKeFGGLpzx63BXQd mRWezsmF5zPSez1P0X4gns5Nw6BYDUvOYQWt6+389n3EOC/TYSTYXi3M31KCCJMp6+Pc t8TA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date; bh=Y4T+3hvS6jpkeObQWXEGEbqZZmpWj7puAkmPZfmhHMo=; b=zPr+K7zRDmdJmMftIDwsRMDckuy+oZal9oTWsHNX7p6rbVpoZOxcYl+YEpuAt+Llme IaYXIn9Ik4CiByLrJZ4/e6AUBTM44CaKG8Q9TRX7F4IHg/i9nDI1yd99eLVq/P/EPtbw 6ro87RzYr6lx7P9oGn8w1EvwRGNHmjZT8yVOs464y9aC/AN2WAWdxU3H0fTecPQf9Kda 8FgyBUXkXROutmyIgs8n/IyoHqm2sWTpRGgMORvf/zCTHzItk7Q8QOIdFh/miSo1MAcL LzEX+ovyZ1eikVmqrEYUGpUr8EougoJb/EgQMuU9wm6+6CihnZgCDS4odeaNw1v5LSsD KNEg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id s4si63729qtc.4.2021.11.17.09.12.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Nov 2021 09:12:31 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 1AHHCTq2012027 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Nov 2021 18:12:29 +0100 Received: from md1za8fc.ad001.siemens.net ([167.87.74.66]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 1AHHCS85024586; Wed, 17 Nov 2021 18:12:29 +0100 Date: Wed, 17 Nov 2021 18:12:24 +0100 From: Henning Schild To: Anton Mikanovich Cc: isar-users@googlegroups.com Subject: Re: [PATCH] isar-bootstrap: Fail on invalid apt source list Message-ID: <20211117181224.6699a2a8@md1za8fc.ad001.siemens.net> In-Reply-To: <20211116095907.198455-1-amikan@ilbers.de> References: <20211116095907.198455-1-amikan@ilbers.de> X-Mailer: Claws Mail 3.18.0 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: viwJAgnDFl3x Am Tue, 16 Nov 2021 12:59:07 +0300 schrieb Anton Mikanovich : > Returning empty list leads to ambiguous errors, so we should fail > early if distro sources.list is empty or incorrect. > > Fix issue #72 Not sure that will work. In case you want github to close on "master" merge. Fixes Closes should work https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue > 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) maybe that should be its own patch? Looks like a drive-by fix. > for source in generate_distro_sources(d): > if source[0] == "deb": > return source[2:] > - return ["", "", ""] > + bb.fatal('Invalid apt sources list') I did a bit of digging in history. Seems like bbfatal is the right thing, the empty strings seem to not have had any deeper meaning. Henning > def get_distro_have_https_source(d): > return any(source[2].startswith("https://") for source in > generate_distro_sources(d))