From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7003745943754375168 X-Received: by 2002:a05:6512:e83:: with SMTP id bi3mr3457703lfb.420.1630686680767; Fri, 03 Sep 2021 09:31:20 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:9109:: with SMTP id m9ls1347442ljg.2.gmail; Fri, 03 Sep 2021 09:31:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwkVCdhIFIpmcUsHH+7D73e74SHu8Vv4EkgjNOR687tz+bagjDwV/FV0oB0paNmX3T91fX6 X-Received: by 2002:a2e:8495:: with SMTP id b21mr3609536ljh.4.1630686679574; Fri, 03 Sep 2021 09:31:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630686679; cv=none; d=google.com; s=arc-20160816; b=SCPwelKdiyojZY/cfH08DQh0aNpGpaRgnSem2229oSAvd9fw7tF7ndct1a/hAp3DQ4 qiGtBdqD7v73pqOzpWKTgrEbekFbjHSgL5mVsiMZ9HqvQ884ONVR7F5rIshmooxMwbDv dKXdnboLW4T2a6oEXEzoGjdfoBWuLD6UhQL5US2juDIPvQjZzJxp6vtWNXvqGFmqF0vB U9p3XTib2QPNYto5wowTq5Wl73Pos91+QmAAmvXb06qePQ6cIN8z2AvBql1J5spA1SoN eqbsxaB6U8FOzafc9C7Zg1mq0lrdCqVadRQm/CxaF5oS2yj89eEdv+f/ptejjGjy+AiT pI5A== 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:date:subject:cc:to:from; bh=j/uux9rSvIfstNzt/+Z9xx3PyKqkfWZG0DAJg80GGTc=; b=T7h8Pwxg6444h05hCJT0RngDedap5xmcRO5MMjHf9f8kErLBj2sjYDow9wAg5Pzi0T f6ObLXtO3D8vYhaucJ3QmDj8Ktlam58w5+Pclp5BUYTtV4+HAz1h3Gs5AipbDI3VCJgI hlH0xigo2gxNLLdFwCjB/f18JIk5LmfhNeEYqBkIrXuFIqk03VTbJWpYSvfnUBtg8fBu NOebhXobpg0Y/gN6PLvPJcxRvbJFJ9NQwvYdS/tHzEnyx3RS9rtlPO+wDkpDV9nm/8ki SyKa/exP0E7KToumt7vZWVXvLKw+gOtlupeD6TJXnAGMct+kUFfqcGsgXbMVOn9yFKo2 l6ow== 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 z4si309746lfr.2.2021.09.03.09.31.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 Sep 2021 09:31:19 -0700 (PDT) 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-70-70-214-37.mgts.dynamic.pppoe.byfly.by [37.214.70.70] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 183GVC0s001961 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 3 Sep 2021 18:31:16 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH 1/2] isar-bootstrap: Fix GPG need check function Date: Fri, 3 Sep 2021 19:31:04 +0300 Message-Id: <20210903163105.54003-2-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210903163105.54003-1-amikan@ilbers.de> References: <20210903163105.54003-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: Y0U5uBRs7r1K After adding BASE_REPO_KEY in 3895266 this check was broken. Signed-off-by: Anton Mikanovich --- meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index c65f2cb..e87c091 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -187,12 +187,12 @@ def get_distro_needs_https_support(d): OVERRIDES_append = ":${@get_distro_needs_https_support(d)}" def get_distro_needs_gpg_support(d): - apt_keys = d.getVar("DISTRO_BOOTSTRAP_KEYS") or "" - apt_keys += " " + (d.getVar("THIRD_PARTY_APT_KEYS") or "") - apt_keys += " " + (d.getVar("BASE_REPO_KEY") or "") - if apt_keys != " ": + if d.getVar("DISTRO_BOOTSTRAP_KEYS") or \ + d.getVar("THIRD_PARTY_APT_KEYS") or \ + d.getVar("BASE_REPO_KEY"): return "gnupg" - return "" + else: + return "" OVERRIDES_append = ":${@get_distro_needs_gpg_support(d)}" -- 2.25.1