[PATCH v2] isar-bootstrap: Remove bogus "resolve=False" from getVar()

[PATCH v2] isar-bootstrap: Remove bogus "resolve=False" from getVar()

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

We need the resolved content of the variables here. Not resolving means
that variables with late resolutions will break this anonymous python
block.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

Changes in v2:
 - added one more cosmetic case

 meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
index 45b1608..1eb2ac6 100644
--- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
+++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
@@ -35,16 +35,16 @@ DISTRO_APT_PREMIRRORS ?= "${@ "http://ftp\.(\S+\.)?debian.org/\S* file:///${REPO
 inherit base-apt-helper
 
 python () {
-    distro_bootstrap_keys = (d.getVar("DISTRO_BOOTSTRAP_KEYS", False) or "").split()
+    distro_bootstrap_keys = (d.getVar("DISTRO_BOOTSTRAP_KEYS") or "").split()
 
-    third_party_apt_keys = (d.getVar("THIRD_PARTY_APT_KEYS", False) or "").split() 
+    third_party_apt_keys = (d.getVar("THIRD_PARTY_APT_KEYS") or "").split()
 
     # The cached repo key can be both for bootstrapping and apt package
     # installation afterwards. However, debootstrap will include the key into
     # the rootfs automatically thus the right place is distro_bootstrap_keys.
 
     if bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')):
-        own_pub_key = d.getVar("BASE_REPO_KEY", False)
+        own_pub_key = d.getVar("BASE_REPO_KEY")
         if own_pub_key:
             distro_bootstrap_keys += own_pub_key.split()
 
@@ -169,7 +169,7 @@ def get_distro_needs_https_support(d, is_host=False):
         return ""
 
 def get_distro_needs_gpg_support(d):
-    apt_keys = d.getVar("THIRD_PARTY_APT_KEYS", False)
+    apt_keys = d.getVar("THIRD_PARTY_APT_KEYS")
     if apt_keys and apt_keys != "":
         return "gnupg"
     return ""
-- 

2.16.4


-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux

Re: [PATCH v2] isar-bootstrap: Remove bogus "resolve=False" from getVar()

[Baurzhan Ismagulov]

On Mon, Aug 19, 2019 at 02:32:22PM +0200, Jan Kiszka wrote:
> We need the resolved content of the variables here. Not resolving means
> that variables with late resolutions will break this anonymous python
> block.

Applied to next, thanks.

With kind regards,
Baurzhan.