From: Henning Schild <henning.schild@siemens.com>
To: isar-users@googlegroups.com
Cc: Jan Kiszka <jan.kiszka@siemens.com>,
Baurzhan Ismagulov <ibr@radix50.net>,
chombourger@gmail.com,
Henning Schild <henning.schild@siemens.com>
Subject: [PATCHv3 2/9] base_apt_helper: change variable names to increase readability
Date: Thu, 7 Nov 2019 19:55:56 +0100 [thread overview]
Message-ID: <20191107185603.9077-3-henning.schild@siemens.com> (raw)
In-Reply-To: <20191107185603.9077-1-henning.schild@siemens.com>
From: Henning Schild <henning.schild@siemens.com>
Use (isar|base)_apt_p instead of "isar_package" as variable name for
package comparison.
Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
meta/classes/base-apt-helper.bbclass | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/meta/classes/base-apt-helper.bbclass b/meta/classes/base-apt-helper.bbclass
index 81df45a..d5674c9 100644
--- a/meta/classes/base-apt-helper.bbclass
+++ b/meta/classes/base-apt-helper.bbclass
@@ -27,17 +27,17 @@ populate_base_apt() {
# Check if this package is taken from Isar-apt, if so - ingore it.
base_name=${package##*/}
- isar_package=$(find ${REPO_ISAR_DIR}/${DISTRO} -name $base_name)
- if [ -n "$isar_package" ]; then
+ isar_apt_p=$(find ${REPO_ISAR_DIR}/${DISTRO} -name $base_name)
+ if [ -n "$isar_apt_p" ]; then
# Check if MD5 sums are identical. This helps to avoid the case
# when packages is overridden from another repo.
- compare_pkg_md5sums "$package" "$isar_package" && continue
+ compare_pkg_md5sums "$package" "$isar_apt_p" && continue
fi
# Check if this package is already in base-apt
- isar_package=$(find ${REPO_BASE_DIR}/${BASE_DISTRO} -name $base_name)
- if [ -n "$isar_package" ]; then
- compare_pkg_md5sums "$package" "$isar_package" && continue
+ base_apt_p=$(find ${REPO_BASE_DIR}/${BASE_DISTRO} -name $base_name)
+ if [ -n "$base_apt_p" ]; then
+ compare_pkg_md5sums "$package" "$base_apt_p" && continue
# md5sum differs, so remove the package from base-apt
name=$(echo $base_name | cut -d '_' -f 1)
--
2.23.0
next prev parent reply other threads:[~2019-11-07 18:56 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-07 18:55 [PATCHv3 0/9] a few cleanups a bug and a feature Henning Schild
2019-11-07 18:55 ` [PATCHv3 1/9] rootfs: fix incorrect feature name in comment Henning Schild
2019-11-07 18:55 ` Henning Schild [this message]
2019-11-07 18:55 ` [PATCHv3 3/9] rootfs: rename ROOTFS_INSTALL_COMMAND lock to "isar-apt-lock" Henning Schild
2019-11-07 18:55 ` [PATCHv3 4/9] dpkg-base: remove pointless ";" s at end of line Henning Schild
2019-11-07 18:55 ` [PATCHv3 5/9] dpkg-base: fix indentation from tabs to spaces Henning Schild
2019-11-07 18:56 ` [PATCHv3 6/9] base: implement BB_NO_NETWORK for apt-get Henning Schild
2019-11-07 18:56 ` [PATCHv3 7/9] meta: do not equip rootfss with resolv.conf when BB_NO_NETWORK Henning Schild
2019-11-07 18:56 ` [PATCHv3 8/9] bootstrap: fix debootstrap gpg issue when base-apt is not signed Henning Schild
2019-11-14 20:11 ` Jan Kiszka
2019-11-14 21:45 ` Henning Schild
2019-11-15 6:07 ` Baurzhan Ismagulov
2019-11-07 18:56 ` [PATCHv3 9/9] meta: dpkg-gbp: remove unneeded proxy export Henning Schild
2019-11-12 16:39 ` [PATCHv3 0/9] a few cleanups a bug and a feature Baurzhan Ismagulov
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=20191107185603.9077-3-henning.schild@siemens.com \
--to=henning.schild@siemens.com \
--cc=chombourger@gmail.com \
--cc=ibr@radix50.net \
--cc=isar-users@googlegroups.com \
--cc=jan.kiszka@siemens.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