From: Anton Mikanovich <amikan@ilbers.de>
To: isar-users@googlegroups.com
Cc: Anton Mikanovich <amikan@ilbers.de>
Subject: [PATCH v2 1/2] isar-bootstrap: Fix GPG need check function
Date: Mon, 13 Sep 2021 17:31:06 +0300 [thread overview]
Message-ID: <20210913143107.181118-2-amikan@ilbers.de> (raw)
In-Reply-To: <20210913143107.181118-1-amikan@ilbers.de>
After adding BASE_REPO_KEY in 3895266 this check was broken.
Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
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
next prev parent reply other threads:[~2021-09-13 14:31 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-13 14:31 [PATCH v2 0/2] Fix gpg-agent management Anton Mikanovich
2021-09-13 14:31 ` Anton Mikanovich [this message]
2021-09-13 14:31 ` [PATCH v2 2/2] isar-bootstrap: Do not let gpg-agent to stay running Anton Mikanovich
2021-09-29 14:22 ` [PATCH v2 0/2] Fix gpg-agent management Anton Mikanovich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210913143107.181118-2-amikan@ilbers.de \
--to=amikan@ilbers.de \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox