From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7003745943754375168 X-Received: by 2002:a7b:cbc4:: with SMTP id n4mr11678238wmi.93.1631543488645; Mon, 13 Sep 2021 07:31:28 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:a314:: with SMTP id c20ls3279364wrb.2.gmail; Mon, 13 Sep 2021 07:31:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzvtidrZubwOV6KjZhQeJTvaJVWiool0Gw4KVejoUBIBFxvkB7QH/ejZx2m5yY9+Hti1ttP X-Received: by 2002:adf:d1a8:: with SMTP id w8mr13013314wrc.306.1631543487732; Mon, 13 Sep 2021 07:31:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631543487; cv=none; d=google.com; s=arc-20160816; b=SzBeCcx6lv/zGBQjO6QxbbCBSYCBRhtcFEK05Icj0gT3XGySbAU/PoMNZAfraAAwjS V2o+qq2gVf2Bl6K0O7t18SEEfzLJAKpJhX4acCo9tpYu9PpSOAmsSDdR0Pnl2wf7t9/6 h9cOOvpdJIUcKKOgMoy4f9VRXDYkaPUAA69KlOEZUBnm33rqi1VmuLt27v+7FzAjHk8V TMHK8hMp1TBFHMXQBXBzpocRWGbmEZW8MtZ0PhJukpulUpDRiMyWS9Za2WMLPIWfiVyb KQuWkuMJZFo7+jKWJNtAmAL80SiRXFbJMMUzaUI4Yv28cZA/29sHjvjVBoNiDfDZ7YME Hssg== 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=AuHNeLiR6/T16ijDklaxXqrDJD9DU8Agrh0R7fTD/lmQtiiyRGRD2VEzfKSznk6Grd LYOzN/RsYj7jv+scyolEfmuOyn0xX6UuEoFi930q+ER4+3Mm+w2hYLyiug+SNt/HACij K9SycBP0odPMrbm33ZrXAAbxNKvsgbkRp7ep9F2Cr7XiZwWCJUsWts2GClFDVQSRmYX5 RldtgNX74hcaFCL57/bEA1CmpYY/ysmBfEKIVsO7R1s208eyIi5DLM9fdnnmJTvB85mr fg4zXp44k8KQ0LCK02Qw9TgSnAQHrNdKfOlQ0+ryDhZC3LAOazTz8jULFIXP42qoLuHd JRPQ== 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 g8si898755wrh.0.2021.09.13.07.31.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Sep 2021 07:31:27 -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-240-58-214-37.mgts.dynamic.pppoe.byfly.by [37.214.58.240] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 18DEVK9R009501 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 13 Sep 2021 16:31:25 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v2 1/2] isar-bootstrap: Fix GPG need check function Date: Mon, 13 Sep 2021 17:31:06 +0300 Message-Id: <20210913143107.181118-2-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210913143107.181118-1-amikan@ilbers.de> References: <20210913143107.181118-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: LUfjesdCT42Y 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