Re: [PATCH v4 3/6] Remove duplicate code from apt-keyring generation

[Henning Schild <henning.schild@siemens.com>]

Am Thu, 7 Mar 2019 15:23:01 +0100
schrieb "[ext] Andreas J. Reichel" <andreas.reichel.ext@siemens.com>:

> From: Andreas Reichel <andreas.reichel.ext@siemens.com>
> 
> Signed-off-by: Andreas Reichel <andreas.reichel.ext@siemens.com>
> ---
>  .../isar-bootstrap/isar-bootstrap.inc         | 24
> +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-)
> 
> diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
> b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index
> 9506741..2d6b761 100644 ---
> a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++
> b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -35,23
> +35,21 @@ inherit base-apt-helper python () {
>      from urllib.parse import urlparse
>      distro_apt_keys = d.getVar("DISTRO_APT_KEYS", False)
> -    wd = d.getVar("WORKDIR", True)
> +    aptkeys = []
> +
>      if distro_apt_keys:
> -        d.setVar("DEBOOTSTRAP_KEYRING", "--keyring ${APTKEYRING}")
> -        for key in distro_apt_keys.split():
> -            url = urlparse(key)
> -            filename = os.path.basename(url.path)
> -            d.appendVar("SRC_URI", " %s" % key)
> -            d.appendVar("APTKEYFILES", " %s" % filename)
> +        aptkeys += distro_apt_keys.split()
>      if bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')):
>          own_pub_key = d.getVar("BASE_REPO_KEY", False)
>          if own_pub_key:
> -            d.setVar("DEBOOTSTRAP_KEYRING", "--keyring
> ${APTKEYRING}")
> -            for key in own_pub_key.split():
> -                url = urlparse(key)
> -                filename = ''.join([wd, url.path])
> -                d.appendVar("SRC_URI", " %s" % key)
> -                d.appendVar("APTKEYFILES", " %s" % filename)
> +            aptkeys += own_pub_key.split()
> +
> +    d.setVar("DEBOOTSTRAP_KEYRING", "--keyring ${APTKEYRING}")
> +    for key in aptkeys:
> +        url = urlparse(key)
> +        filename = os.path.basename(url.path)
> +        d.appendVar("SRC_URI", " %s" % key)
> +        d.appendVar("APTKEYFILES", " %s" % filename)
>  }
>  
>  def aggregate_files(d, file_list, file_out):

Now i get where the duplication came from in the first place.

And as said in another thread, we need this here in a central location:
DISTRO_APT_KEYS_append = "${BASE_REPO_KEY}"

I kind of feel sorry to discover other patch mistakes in reviewing your
series ....

Henning